georeferencer: fix crash which occured when adding GCPs after the widget

docking has been disabled. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13560 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 24, 2010 · 5a8575f · 5a8575f
1 parent becabd6
commit 5a8575f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -117,8 +117,9 @@ void QgsGeorefPluginGui::dockThisWindow( bool dock )
 {
   if ( mDock )
   {
-    setParent( 0 );
+    setParent( mIface->mainWindow(), Qt::Window );
     show();
+
     mIface->removeDockWidget( mDock );
     mDock->setWidget( 0 );
     delete mDock;

diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.cpp b/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
@@ -134,6 +134,8 @@ void QgsMapCoordsDialog::setToolEmitPoint( bool isEnable )
   if ( isEnable )
   {
     parentWidget()->showMinimized();
+
+    assert( parentWidget()->parentWidget() != 0 );
     parentWidget()->parentWidget()->activateWindow();
     parentWidget()->parentWidget()->raise();