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

mmassing · mmassing · commit 5a8575fbb9dc · 2010-05-24T12:42:54.000Z
docking has been disabled. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13560 c8812cc2-4d05-0410-92ff-de0c093fc19c
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();
 

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,9 @@ void QgsGeorefPluginGui::dockThisWindow( bool dock )`
`117`	`117`	`{`
`118`	`118`	`if ( mDock )`
`119`	`119`	`{`
`120`		`- setParent( 0 );`
	`120`	`+ setParent( mIface->mainWindow(), Qt::Window );`
`121`	`121`	`show();`
	`122`	`+`
`122`	`123`	`mIface->removeDockWidget( mDock );`
`123`	`124`	`mDock->setWidget( 0 );`
`124`	`125`	`delete mDock;`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ void QgsMapCoordsDialog::setToolEmitPoint( bool isEnable )`
`134`	`134`	`if ( isEnable )`
`135`	`135`	`{`
`136`	`136`	`parentWidget()->showMinimized();`
	`137`	`+`
	`138`	`+ assert( parentWidget()->parentWidget() != 0 );`
`137`	`139`	`parentWidget()->parentWidget()->activateWindow();`
`138`	`140`	`parentWidget()->parentWidget()->raise();`
`139`	`141`