Merge remote-tracking branch 'brushtyler/master'

qgis · Nov 8, 2011 · eda69e6 · eda69e6
2 parents c37b63a + 98d5a76
commit eda69e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
@@ -37,6 +37,7 @@ QgsProjectionSelector::QgsProjectionSelector( QWidget* parent, const char *name,
     : QWidget( parent, fl )
     , mProjListDone( false )
     , mUserProjListDone( false )
+    , mRecentProjListDone( false )
     , mCRSNameSelectionPending( false )
     , mCRSIDSelectionPending( false )
     , mAuthIDSelectionPending( false )
@@ -168,10 +169,12 @@ void QgsProjectionSelector::showEvent( QShowEvent * theEvent )
     applySelection();
   }
 
-  lstRecent->clear();
+  if ( !mRecentProjListDone )
-
+  {
-  for ( int i = mRecentProjections.size() - 1; i >= 0; i-- )
+    for ( int i = mRecentProjections.size() - 1; i >= 0; i-- )
-    insertRecent( mRecentProjections.at( i ).toLong() );
+      insertRecent( mRecentProjections.at( i ).toLong() );
+    mRecentProjListDone = true;
+  }
 
   // Pass up the inheritance hierarchy
   QWidget::showEvent( theEvent );
@@ -859,7 +862,8 @@ void QgsProjectionSelector::on_cbxHideDeprecated_stateChanged()
 void QgsProjectionSelector::on_lstRecent_currentItemChanged( QTreeWidgetItem *current, QTreeWidgetItem *previous )
 {
   Q_UNUSED( previous );
-  setSelectedCrsId( current->text( QGIS_CRS_ID_COLUMN ).toLong() );
+  if ( current )
+    setSelectedCrsId( current->text( QGIS_CRS_ID_COLUMN ).toLong() );
 }
 
 void QgsProjectionSelector::on_pbnFind_clicked()

diff --git a/src/gui/qgsprojectionselector.h b/src/gui/qgsprojectionselector.h
@@ -187,6 +187,9 @@ class GUI_EXPORT QgsProjectionSelector: public QWidget, private Ui::QgsProjectio
     //! Has the User Projection List been populated?
     bool mUserProjListDone;
 
+    //! Has the Recent Projection List been populated?
+    bool mRecentProjListDone;
+
     //! Is there a pending selection to be made by CRS Name?
     bool mCRSNameSelectionPending;