aboutsummaryrefslogtreecommitdiffstats
path: root/src/pgtkfns.c
diff options
context:
space:
mode:
authorRobert Pluim2021-02-11 16:53:13 +0100
committerRobert Pluim2021-02-11 17:00:03 +0100
commit175ebb010477ff0e174fe5145154397f43dee2d2 (patch)
tree4c6fb9aee070622642bac451b90b8fa8aa6fae0e /src/pgtkfns.c
parentef76e64427bb980cca23c338df2526766431ea52 (diff)
downloademacs-175ebb010477ff0e174fe5145154397f43dee2d2.tar.gz
emacs-175ebb010477ff0e174fe5145154397f43dee2d2.zip
Don't crash if we can't find a monitor model name
This can happen when running emacs over a forwarded X11 connection. * src/pgtkfns.c (pgtk_get_monitor_scale_factor): Return 0 if we're passed a NULL model name.
Diffstat (limited to 'src/pgtkfns.c')
-rw-r--r--src/pgtkfns.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index cee24c1ad12..07636a25ca0 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -66,6 +66,9 @@ static Lisp_Object monitor_scale_factor_alist;
66static double 66static double
67pgtk_get_monitor_scale_factor (const char *model) 67pgtk_get_monitor_scale_factor (const char *model)
68{ 68{
69 if (model == NULL)
70 return 0.0;
71
69 Lisp_Object mdl = build_string (model); 72 Lisp_Object mdl = build_string (model);
70 Lisp_Object tem = Fassoc(mdl, monitor_scale_factor_alist, Qnil); 73 Lisp_Object tem = Fassoc(mdl, monitor_scale_factor_alist, Qnil);
71 if (NILP (tem)) 74 if (NILP (tem))