Skip to content

Commit 7a8ab40

Browse files
authored
Merge pull request #3440 from nirvn/qt5_fix_freeze
Remove composer window visibiliy state restoration upon project load (fixes #15495)
2 parents d5377db + 08f5ae6 commit 7a8ab40

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

src/app/composer/qgscomposer.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -3479,15 +3479,6 @@ void QgsComposer::writeXml( QDomNode& parentNode, QDomDocument& doc )
34793479
}
34803480
mMapsToRestore.clear();
34813481

3482-
//store if composer is open or closed
3483-
if ( isVisible() )
3484-
{
3485-
composerElem.setAttribute( "visible", 1 );
3486-
}
3487-
else
3488-
{
3489-
composerElem.setAttribute( "visible", 0 );
3490-
}
34913482
parentNode.appendChild( composerElem );
34923483

34933484
//store composition

src/app/qgisapp.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -6606,18 +6606,13 @@ bool QgisApp::loadComposersFromProject( const QDomDocument& doc )
66066606
mPrintComposersMenu->addAction( composer->windowAction() );
66076607
#ifndef Q_OS_MACX
66086608
composer->setWindowState( Qt::WindowMinimized );
6609-
composer->show();
66106609
#endif
66116610
composer->zoomFull();
66126611
QgsComposerView* composerView = composer->view();
66136612
if ( composerView )
66146613
{
66156614
composerView->updateRulers();
66166615
}
6617-
if ( composerNodes.at( i ).toElement().attribute( "visible", "1" ).toInt() < 1 )
6618-
{
6619-
composer->close();
6620-
}
66216616
emit composerAdded( composer->view() );
66226617
connect( composer, SIGNAL( composerAdded( QgsComposerView* ) ), this, SIGNAL( composerAdded( QgsComposerView* ) ) );
66236618
connect( composer, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ), this, SIGNAL( composerWillBeRemoved( QgsComposerView* ) ) );

0 commit comments

Comments
 (0)