anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring window to front after loading a document

Browse Source 
Fixes #7875.
This commit is contained in:
Enrico Forestieri 2016-07-03 22:58:25 +02:00
parent 0f2dc7d0a7
commit 16ec606ab4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/frontends/qt4/GuiApplication.cpp
View File

@ -1678,14 +1678,21 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
// but let's make sure // but let's make sure
LASSERT(current_view_, break); LASSERT(current_view_, break);
current_view_->openDocument(fname); current_view_->openDocument(fname);
// FIXME but then why check current_view_ here? if (!current_view_->documentBufferView())
if (current_view_ && !current_view_->documentBufferView())
current_view_->close(); current_view_->close();
else {
current_view_->raise();
current_view_->activateWindow();
current_view_->showNormal();
}
} else { } else {
// we know !d->views.empty(), so this should be ok // we know !d->views.empty(), so this should be ok
// but let's make sure // but let's make sure
LASSERT(current_view_, break); LASSERT(current_view_, break);
current_view_->openDocument(fname); current_view_->openDocument(fname);
current_view_->raise();
current_view_->activateWindow();
current_view_->showNormal();
} }
break; break;
} }