diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 6e1dab6637..98d7a866ac 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -1161,6 +1161,10 @@ Desktop::ScreenChanged(Screen* screen, bool makeDefault) status_t Desktop::StoreConfiguration(int32 workspace) { + // TODO: This only works because StoreConfiguration is never called + // for an inactive workspace. fVirtualScreen has the screen mode + // of the current workspace. + if (workspace >= 0 && workspace < fSettings->WorkspacesCount()) { // store settings BMessage settings;