anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crashes and asserts if LyX doesn't have a view (on Mac for example).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35787 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-10-22 20:54:18 +00:00
parent 445436e078
commit d9c6263c6a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1127,7 +1127,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd)
void GuiApplication::gotoBookmark(unsigned int idx, bool openFile, void GuiApplication::gotoBookmark(unsigned int idx, bool openFile,
bool switchToBuffer) bool switchToBuffer)
{ {
LASSERT(current_view_, /**/);
if (!theSession().bookmarks().isValid(idx)) if (!theSession().bookmarks().isValid(idx))
return; return;
BookmarksSection::Bookmark const & bm = BookmarksSection::Bookmark const & bm =
@ -1367,7 +1366,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
string lyx_name; string lyx_name;
string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' '); string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' ');
if (lyx_name.empty() || x11_name.empty()) { if (lyx_name.empty() || x11_name.empty()) {
current_view_->message( if (current_view_)
current_view_->message(
_("Syntax: set-color <lyx_name> <x11_name>")); _("Syntax: set-color <lyx_name> <x11_name>"));
break; break;
} }
@ -1702,7 +1702,8 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state)
// Do nothing if we have nothing (JMarc) // Do nothing if we have nothing (JMarc)
if (!keysym.isOK()) { if (!keysym.isOK()) {
LYXERR(Debug::KEY, "Empty kbd action (probably composing)"); LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
current_view_->restartCursor(); if (current_view_)
current_view_->restartCursor();
return; return;
} }
@ -1745,7 +1746,7 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state)
// why not return already here if action == -1 and // why not return already here if action == -1 and
// num_bytes == 0? (Lgb) // num_bytes == 0? (Lgb)
if (d->keyseq.length() > 1) if (d->keyseq.length() > 1 && current_view_)
current_view_->message(d->keyseq.print(KeySequence::ForGui)); current_view_->message(d->keyseq.print(KeySequence::ForGui));
@ -1767,8 +1768,10 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state)
FuncRequest::KEYBOARD); FuncRequest::KEYBOARD);
} else { } else {
LYXERR(Debug::KEY, "Unknown, !isText() - giving up"); LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
current_view_->message(_("Unknown function.")); if (current_view_) {
current_view_->restartCursor(); current_view_->message(_("Unknown function."));
current_view_->restartCursor();
}
return; return;
} }
} }