Fixed another incorrect QgsMessageViewer usage.

(QGIS was crashing on second WMS identify request) git-svn-id: http://svn.osgeo.org/qgis/trunk@6922 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 1, 2007 · 147876d · 147876d
1 parent 5340f7e
commit 147876d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
@@ -40,7 +40,6 @@
 QgsMapToolIdentify::QgsMapToolIdentify(QgsMapCanvas* canvas)
   : QgsMapTool(canvas),
     mResults(0),
-    mViewer(0),
     mRubberBand(0)
 {
   // set cursor
@@ -55,11 +54,6 @@ QgsMapToolIdentify::~QgsMapToolIdentify()
     mResults->done(0);
   }
 
-  if (mViewer)
-  {
-    delete mViewer;
-  }
-
   delete mRubberBand;
 }
 
@@ -179,16 +173,11 @@ void QgsMapToolIdentify::identifyRasterWmsLayer(QgsRasterLayer* layer, const Qgs
     return;
   }
 
-  if (!mViewer)
-  {
-    mViewer = new QgsMessageViewer();
-  }
-
-  mViewer->setCaption( layer->name() );
-  mViewer->setMessageAsPlainText( text );
+  QgsMessageViewer* viewer = new QgsMessageViewer();
+  viewer->setCaption( layer->name() );
+  viewer->setMessageAsPlainText( text );
 
-//  mViewer->exec();
-  mViewer->show();
+  viewer->showMessage(); // deletes itself on close
 }
 
 void QgsMapToolIdentify::identifyVectorLayer(QgsVectorLayer* layer, const QgsPoint& point)

diff --git a/src/app/qgsmaptoolidentify.h b/src/app/qgsmaptoolidentify.h
@@ -23,7 +23,6 @@
 #include <QObject>
 
 class QgsIdentifyResults;
-class QgsMessageViewer;
 class QgsMapLayer;
 class QgsRasterLayer;
 class QgsRubberBand;
@@ -95,9 +94,6 @@ class QgsMapToolIdentify : public QgsMapTool
     //! Pointer to the identify results dialog for name/value pairs
     QgsIdentifyResults *mResults;
 
-    //! Pointer to the identify results dialog for WMS XML files
-    QgsMessageViewer * mViewer;
-
     //! Rubber band for highlighting identified feature
     QgsRubberBand* mRubberBand;