Bug 814953 - Check for possible widget tear down before calling UpdateWindow in widget's Show. r=bbondy a=akeybl
authorJim Mathies <jmathies@mozilla.com>
Thu, 20 Dec 2012 07:03:08 -0600
changeset 119018 0887d48568fc86dc9e730c6a60eb84730a0eb7f7
parent 119017 eaccb5edc854a6a1756ba315810583eff90fca83
child 119019 cb81bd72390d4964067cdf5e8f239a24814b59bc
push id3028
push userjmathies@mozilla.com
push dateThu, 20 Dec 2012 13:03:28 +0000
treeherdermozilla-aurora@0887d48568fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy, akeybl
bugs814953
milestone19.0a2
Bug 814953 - Check for possible widget tear down before calling UpdateWindow in widget's Show. r=bbondy a=akeybl
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1188,17 +1188,17 @@ NS_METHOD nsWindow::Show(bool bState)
                        SWP_NOZORDER | SWP_NOACTIVATE);
       }
     }
   }
   
 #ifdef MOZ_XUL
   if (!wasVisible && bState) {
     Invalidate();
-    if (syncInvalidate) {
+    if (syncInvalidate && !mInDtor && !mOnDestroyCalled) {
       ::UpdateWindow(mWnd);
     }
   }
 #endif
 
   return NS_OK;
 }