[QGIS Commit] r13560 - trunk/qgis/src/plugins/georeferencer

[svn_qgis at osgeo.org]

Author: mmassing
Date: 2010-05-24 08:42:54 -0400 (Mon, 24 May 2010)
New Revision: 13560

Modified:
   trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
   trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
Log:
georeferencer: fix crash which occured when adding GCPs after the widget
docking has been disabled.

Modified: trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-05-24 12:42:42 UTC (rev 13559)
+++ trunk/qgis/src/plugins/georeferencer/qgsgeorefplugingui.cpp	2010-05-24 12:42:54 UTC (rev 13560)
@@ -117,8 +117,9 @@
 {
   if ( mDock )
   {
-    setParent( 0 );
+    setParent( mIface->mainWindow(), Qt::Window );
     show();
+
     mIface->removeDockWidget( mDock );
     mDock->setWidget( 0 );
     delete mDock;

Modified: trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp
===================================================================
--- trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp	2010-05-24 12:42:42 UTC (rev 13559)
+++ trunk/qgis/src/plugins/georeferencer/qgsmapcoordsdialog.cpp	2010-05-24 12:42:54 UTC (rev 13560)
@@ -134,6 +134,8 @@
   if ( isEnable )
   {
     parentWidget()->showMinimized();
+
+    assert( parentWidget()->parentWidget() != 0 );
     parentWidget()->parentWidget()->activateWindow();
     parentWidget()->parentWidget()->raise();