Ticket #4339: ScreenSaverWindew.cpp.diff

src/preferences/screensaver/ScreenSaverWindow.cpp

@@ -97 +97 @@
         void PopulateScreenSaverList();
         void SaveState();
 
+        inline void SetQuitting(bool quitting) {fIsQuitting = quitting;}
+
     private:
         static int _CompareScreenSaverItems(const void* left, const void* right);
         BScreenSaver* _ScreenSaver();
         void _CloseSaver();
         void _OpenSaver();
 
+        inline bool IsQuitting() {return fIsQuitting;}
+
         BFilePanel*     fFilePanel;
         BListView*      fListView;
         BButton*        fTestButton;
@@ -118 +122 @@
         PreviewView*    fPreviewView;
 
         team_id         fScreenSaverTestTeamId;
+
+        bool            fIsQuitting;
 };
 
 static const int32 kTimeInUnits[] = {
@@ -252 +258 @@
     : BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW),
     fSettings(settings),
     fSaverRunner(NULL),
-    fSettingsView(NULL)
+    fSettingsView(NULL),
+    fIsQuitting(false)
 {
     SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
@@ -308 +315 @@
 void
 ModulesView::DetachedFromWindow()
 {
+    if (!IsQuitting())
+        SaveState();
     _CloseSaver();
 }
 
@@ -920 +929 @@
     _UpdateStatus();
     fModulesView->SaveState();
     fSettings.Save();
+    fModulesView->SetQuitting(true);
 
     be_app->PostMessage(B_QUIT_REQUESTED);
     return true;