Skip to content
Permalink
Browse files

Fix welcome screen vs project loading

  • Loading branch information
NathanW2 committed Aug 27, 2015
1 parent c285ed1 commit bea14e3ace1597d7c357788fb7af25b9bc1229da
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/app/qgisapp.cpp
@@ -590,8 +590,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,

qobject_cast<QGridLayout *>( centralWidget->layout() )->addWidget( mCentralContainer, 0, 0, 2, 1 );

mCentralContainer->setCurrentIndex( 1 );
connect( mMapCanvas, SIGNAL( layersChanged() ), this, SLOT( showMapCanvas() ) );
connect( this, SIGNAL( newProject() ), this, SLOT( showMapCanvas() ) );

mCentralContainer->setCurrentIndex( 1 );

// a bar to warn the user with non-blocking messages
mInfoBar = new QgsMessageBar( centralWidget );
@@ -3929,8 +3931,6 @@ void QgisApp::fileOpenAfterLaunch()
QString projPath = QString();
if ( projOpen == 0 ) // welcome page
{
connect( mMapCanvas, SIGNAL( layersChanged() ), this, SLOT( showMapCanvas() ) );
connect( this, SIGNAL( newProject() ), this, SLOT( showMapCanvas() ) );
return;
}
if ( projOpen == 1 && mRecentProjects.size() > 0 ) // most recent project

4 comments on commit bea14e3

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Aug 27, 2015

hmmm, now start page doesn't show up when QGIS is started without a project...
sorry

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied Aug 27, 2015

What was the problem with loading projects? I thought I had fixed that in 16d7a06.

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Aug 27, 2015

before this commit, when running QGIS with a project the welcome page was staying on top, even if opening a new project.
after this commit, welcome page is not show when starting QGIS.

I did not noticed 16d7a06 and can't say when the bug appeared.

@jef-n

This comment has been minimized.

Copy link
Member

@jef-n jef-n replied Aug 27, 2015

Hm, sounds like I ran into that too. But I switched back/forward to "New" afterwards, so I can't say for sure either.

Please sign in to comment.
You can’t perform that action at this time.