Fix crash on startup if PyQGIS fails to load

wonder-sk · wonder-sk · commit 3dfa26051aad · 2015-03-18T14:24:36.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -740,7 +740,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   }
   else
   {
-    mActionShowPythonDialog->setVisible( false );
+    // python is disabled so get rid of the action for python console
+    delete mActionShowPythonDialog;
+    mActionShowPythonDialog = 0;
   }
 
   mSplash->showMessage( tr( "Initializing file filters" ), Qt::AlignHCenter | Qt::AlignBottom );
@@ -7525,11 +7527,6 @@ void QgisApp::loadPythonSupport()
 
     QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ), QString::null, QgsMessageLog::INFO );
   }
-  else
-  {
-    delete mActionShowPythonDialog;
-    mActionShowPythonDialog = 0;
-  }
 }
 
 void QgisApp::checkQgisVersion()

Original file line number	Diff line number	Diff line change
`@@ -740,7 +740,9 @@ QgisApp::QgisApp( QSplashScreen splash, bool restorePlugins, QWidget parent,`
`740`	`740`	`}`
`741`	`741`	`else`
`742`	`742`	`{`
`743`		`- mActionShowPythonDialog->setVisible( false );`
	`743`	`+ // python is disabled so get rid of the action for python console`
	`744`	`+ delete mActionShowPythonDialog;`
	`745`	`+ mActionShowPythonDialog = 0;`
`744`	`746`	`}`
`745`	`747`
`746`	`748`	`mSplash->showMessage( tr( "Initializing file filters" ), Qt::AlignHCenter \| Qt::AlignBottom );`
`@@ -7525,11 +7527,6 @@ void QgisApp::loadPythonSupport()`
`7525`	`7527`
`7526`	`7528`	`QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ), QString::null, QgsMessageLog::INFO );`
`7527`	`7529`	`}`
`7528`		`- else`
`7529`		`- {`
`7530`		`- delete mActionShowPythonDialog;`
`7531`		`- mActionShowPythonDialog = 0;`
`7532`		`- }`
`7533`	`7530`	`}`
`7534`	`7531`
`7535`	`7532`	`void QgisApp::checkQgisVersion()`