зеркало из https://github.com/mozilla/gecko-dev.git
Use nsBrowserWindow::CloseAllWindows to shutdown cleanly; added a missing NS_RELEASE and removed an improper NS_ADDREF
This commit is contained in:
Родитель
55747c08b3
Коммит
9bfd1743c2
|
@ -113,6 +113,10 @@ nsViewerApp::QueryInterface(REFNSIID aIID, void** aInstancePtrResult)
|
||||||
void
|
void
|
||||||
nsViewerApp::Destroy()
|
nsViewerApp::Destroy()
|
||||||
{
|
{
|
||||||
|
// Close all of our windows
|
||||||
|
nsBrowserWindow::CloseAllWindows();
|
||||||
|
|
||||||
|
// Release the crawler
|
||||||
NS_IF_RELEASE(mCrawler);
|
NS_IF_RELEASE(mCrawler);
|
||||||
|
|
||||||
// Only shutdown if Initialize has been called...
|
// Only shutdown if Initialize has been called...
|
||||||
|
@ -440,6 +444,7 @@ nsViewerApp::OpenWindow()
|
||||||
else {
|
else {
|
||||||
bw->GoTo(mStartURL);
|
bw->GoTo(mStartURL);
|
||||||
}
|
}
|
||||||
|
NS_RELEASE(bw);
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -456,7 +461,6 @@ nsViewerApp::OpenWindow(PRUint32 aNewChromeMask, nsIBrowserWindow*& aNewWindow)
|
||||||
bw->Init(mAppShell, mPrefs, nsRect(0, 0, 620, 400), aNewChromeMask, mAllowPlugins);
|
bw->Init(mAppShell, mPrefs, nsRect(0, 0, 620, 400), aNewChromeMask, mAllowPlugins);
|
||||||
|
|
||||||
aNewWindow = bw;
|
aNewWindow = bw;
|
||||||
NS_ADDREF(bw);
|
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче