diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2014-10-14 03:49:44 +0000 |
|---|---|---|
| committer | bryce <bryce@ubuntu.com> | 2014-10-14 03:49:44 +0000 |
| commit | 35153b45814dcc844213951352f410b2fc13e2ad (patch) | |
| tree | 56eaad7dd9e83602235203668f2984cf6218b5e1 /src/ui/widget/selected-style.cpp | |
| parent | 2geom: Re-fix IS_NAN and IS_FINITE for solaris (diff) | |
| download | inkscape-35153b45814dcc844213951352f410b2fc13e2ad.tar.gz inkscape-35153b45814dcc844213951352f410b2fc13e2ad.zip | |
Fix crash with GTK+ 3.14 on launch
Patch from Liam to check for undefined desktop during startup.
** (inkscape:57708): CRITICAL **: SPCanvas* sp_desktop_canvas(const
SPDesktop*): assertion 'desktop != NULL' failed
Fixes: https://bugs.launchpad.net/inkscape/+bug/1375085
Fixed bugs:
- https://launchpad.net/bugs/1375085
(bzr r13611)
Diffstat (limited to 'src/ui/widget/selected-style.cpp')
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index f01366e19..a575dd592 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1199,7 +1199,9 @@ void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) { menu->show_all(); } -void SelectedStyle::on_opacity_changed () { +void SelectedStyle::on_opacity_changed () +{ + g_return_if_fail(_desktop); // TODO this shouldn't happen! if (_opacity_blocked) return; _opacity_blocked = true; |