Fixed crash in browser startup on Mac

qgis · Dec 1, 2014 · 4fde34a · 4fde34a
1 parent 48edab4
commit 4fde34a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -316,7 +316,9 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
 void QgsBrowserDockWidget::hideEvent( QHideEvent * e )
 {
   QgsDebugMsg( "Entered" );
-  saveState();
+  // hideEvent() may be called (Mac) before showEvent
+  if ( mModel )
+    saveState();
   QDockWidget::hideEvent( e );
 }
 
@@ -811,6 +813,9 @@ QStringList QgsBrowserDockWidget::expandedPathsList( const QModelIndex & proxyIn
 {
   QStringList paths;
 
+  if ( !mModel || !mProxyModel || !mBrowserView )
+    return paths;
+
   for ( int i = 0; i < mProxyModel->rowCount( proxyIndex ); i++ )
   {
     QModelIndex childProxyIndex = mProxyModel->index( i, 0, proxyIndex );