anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#7149 fix a crash on file-open with having some view but no current one

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37248 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2011-01-18 15:22:10 +00:00
parent 9815078bab
commit 1a1c9dba4c
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1237,6 +1237,23 @@ void GuiApplication::reconfigure(string const & option)
"updated document class specifications."));
}
void GuiApplication::validateCurrentView()
{
if (!d->views_.empty() && !current_view_) {
// currently at least one view exists but no view has the focus.
// choose a view to open the document in it.
// a view without any open document is preferred.
GuiView * candidate = 0;
QHash<int, GuiView *>::const_iterator it = d->views_.begin();
QHash<int, GuiView *>::const_iterator end = d->views_.end();
for (; it != end; ++it) {
candidate = *it;
if (!candidate->documentBufferView())
break;
}
setCurrentView(candidate);
}
}
void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
@ -1307,6 +1324,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
}
case LFUN_BUFFER_NEW:
validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView(QString(), false); // keep hidden
@ -1319,6 +1337,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
case LFUN_BUFFER_NEW_TEMPLATE:
validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView();
@ -1331,6 +1350,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
break;
case LFUN_FILE_OPEN: {
validateCurrentView();
// FIXME: create a new method shared with LFUN_HELP_OPEN.
string const fname = to_utf8(cmd.argument());
if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs

2
src/frontends/qt4/GuiApplication.h
View File

@ -182,6 +182,8 @@ private Q_SLOTS:
void slotProcessFuncRequestQueue() { processFuncRequestQueue(); }
private:
///
void validateCurrentView();
///
bool closeAllViews();
/// read the given ui (menu/toolbar) file