summaryrefslogtreecommitdiffstats
path: root/src/sp-namedview.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2017-07-12 12:47:29 +0000
committerTavmjong Bah <tavmjong@free.fr>2017-07-12 12:47:29 +0000
commit894031a25dd1ff5c71a2c87b20e0b479ca081710 (patch)
tree67844be143443543a87dbc5d731ec4eff2c4e72e /src/sp-namedview.cpp
parentMerge branch 'shortcuts' (!41) (diff)
downloadinkscape-894031a25dd1ff5c71a2c87b20e0b479ca081710.tar.gz
inkscape-894031a25dd1ff5c71a2c87b20e0b479ca081710.zip
Prevent crash when get_primary_monitor() returns nullptr. (Second place.)
Diffstat (limited to 'src/sp-namedview.cpp')
-rw-r--r--src/sp-namedview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index a3a5617e1..2992b85d3 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -804,7 +804,11 @@ void sp_namedview_window_from_document(SPDesktop *desktop)
#if WITH_GTKMM_3_22
auto const display = Gdk::Display::get_default();
auto const monitor = display->get_primary_monitor();
- monitor->get_geometry(monitor_geometry);
+
+ // If user hasn't configured a primary monitor, nullptr is returned.
+ if (monitor) {
+ monitor->get_geometry(monitor_geometry);
+ }
#else
auto const default_screen = Gdk::Screen::get_default();
auto const monitor_number = default_screen->get_primary_monitor();