* Use Shift instead of Option as modifier to load workspace settings, as it conflicts with option+N used to open a new

terminal
 * Also ensure that the terminal end up on the current workspace if there is a problem with the settings or the key isn't 
pressed.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38223 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/terminal/TermApp.cpp

@@ -79,6 +79,7 @@ TermApp::TermApp()
 		int l = (j * 16)  + 50;
 
 		fTermFrame.Set(k, l, k + 50, k + 50);
+		fTermWorkspaces = B_CURRENT_WORKSPACE;
 	}
 }
 
@@ -288,8 +289,10 @@ TermApp::_LoadWindowPosition(BRect* frame, uint32* workspaces)
 	status = position.FindInt32("workspaces", fWindowNumber - 1, &_workspaces);
 	if (status != B_OK)
 		return status;
-	if (modifiers() & B_OPTION_KEY)
+	if (modifiers() & B_SHIFT_KEY)
 		*workspaces = _workspaces;
+	else
+		*workspaces = B_CURRENT_WORKSPACE;
 
 	printf("loading settings ok\n");
 	return B_OK;