pwm close fix

1 files changed, 10 insertions, 0 deletions

diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index fbd17a7..68f3637 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -176,24 +176,33 @@ void PwMInit::initializeApp()
 	} else {
 		createMainWnd(conf()->confGlobAutoStart(),
 			      openDeeplocked,
 			      true,
 			      0,
 			      savedCmd.minimized);
 	}
 	runStatus = running;
 }
 
 void PwMInit::shutdownApp(int exitStatus)
 {
+
+
+	PwM * iii;
+	while (  iii = _mainWndList.first() ) {
+        disconnect(iii, SIGNAL(closed(PwM *)),
+                   this, SLOT(mainWndClosed(PwM *)));
+        mainWndClosed((iii));
+    }
+
 	printDebug(string("PwMInit::shutdownApp(")
 		   + tostr(exitStatus) + ") called.");
 	PWM_ASSERT((runStatus == running) || (runStatus == init));
 	runStatus = shutdown;
 	QApplication::exit(exitStatus);
 	/* The destructor of PwMInit is called when control
 	 * leaves main()
 	 */
 }
 
 void PwMInit::initPosixSignalHandler()
 {
@@ -415,24 +424,25 @@ again:
 		}
 	}
 #ifndef PWM_EMBEDDED
 	// find the closed window in the "mainWndList" and delete it.
 	QValueList<PwM *>::iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 #else
 	// find the closed window in the "mainWndList" and delete it.
 	QValueList<PwM *>::Iterator i = _mainWndList.begin(),
 				    end = _mainWndList.end();
 #endif
 	while (i != end) {
+        //qDebug("iii %x  end %x  wnd %x",  (*i), (*end), wnd);
 		if (*i == wnd) {
 #ifndef PWM_EMBEDDED
 			_mainWndList.erase(i);
 #else
 			_mainWndList.remove(i);
 #endif
          
             if ( app->mainWidget() == wnd ) {
                 if (  _mainWndList.count() ) {
 #ifndef DESKTOP_VERSION
                     app->showMainWidget(_mainWndList.first() );
 #endif //DESKTOP_VERSION