Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3440 from nirvn/qt5_fix_freeze
Remove composer window visibiliy state restoration upon project load (fixes #15495)
  • Loading branch information
nyalldawson committed Aug 31, 2016
2 parents d5377db + 08f5ae6 commit 7a8ab40
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
9 changes: 0 additions & 9 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -3479,15 +3479,6 @@ void QgsComposer::writeXml( QDomNode& parentNode, QDomDocument& doc )
}
mMapsToRestore.clear();

//store if composer is open or closed
if ( isVisible() )
{
composerElem.setAttribute( "visible", 1 );
}
else
{
composerElem.setAttribute( "visible", 0 );
}
parentNode.appendChild( composerElem );

//store composition
Expand Down
5 changes: 0 additions & 5 deletions src/app/qgisapp.cpp
Expand Up @@ -6606,18 +6606,13 @@ bool QgisApp::loadComposersFromProject( const QDomDocument& doc )
mPrintComposersMenu->addAction( composer->windowAction() );
#ifndef Q_OS_MACX
composer->setWindowState( Qt::WindowMinimized );
composer->show();
#endif
composer->zoomFull();
QgsComposerView* composerView = composer->view();
if ( composerView )
{
composerView->updateRulers();
}
if ( composerNodes.at( i ).toElement().attribute( "visible", "1" ).toInt() < 1 )
{
composer->close();
}
emit composerAdded( composer->view() );
connect( composer, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
connect( composer, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );
Expand Down

0 comments on commit 7a8ab40

Please sign in to comment.