Skip to content

Commit

Permalink
Fix welcome screen vs project loading
Browse files Browse the repository at this point in the history
  • Loading branch information
@NathanW2
NathanW2 committed Aug 27, 2015
1 parent c285ed1 commit bea14e3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/app/qgisapp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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
Expand Down

4 comments on commit bea14e3

@3nids
Copy link
Member

@3nids 3nids commented on bea14e3 Aug 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@jef-n
Copy link
Member

@jef-n jef-n commented on bea14e3 Aug 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@3nids
Copy link
Member

@3nids 3nids commented on bea14e3 Aug 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

@jef-n jef-n commented on bea14e3 Aug 27, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.