#147929

r=jkobal, sr=blizzard
OS/2 only - handle special case of WM_QUIT so don't stop the OS from shutting down

widget/src/os2/nsAppShell.cpp

@@ -164,12 +164,15 @@ nsresult nsAppShell::Run()
             if (mDispatchListener)
                mDispatchListener->AfterDispatch();
          } else {
-            if( mQmsg.hwnd) {
+            if ((mQmsg.hwnd) && (mQmsg.mp1 || mQmsg.mp2)) {
                // send WM_SYSCOMMAND, SC_CLOSE to window (tasklist close)
                WinSendMsg( mQmsg.hwnd, WM_SYSCOMMAND, MPFROMSHORT(SC_CLOSE), 0);
             } else {
-               if( mQuitNow)     // Don't want to close the app when a window 
-                  keepGoing = 0; // is closed, just when our `Exit' is called.
+               // Don't want to close the app when a window  
+               // is closed, just when our `Exit' is called or
+               // shutdown is invoked.
+               if (mQuitNow || ((mQmsg.mp1 == 0) && (mQmsg.mp2 == 0)))
+                  keepGoing = 0;
             }
          }