diff options
| author | Robert Pluim <rpluim@gmail.com> | 2021-02-11 16:53:13 +0100 |
|---|---|---|
| committer | Robert Pluim <rpluim@gmail.com> | 2021-02-11 17:00:03 +0100 |
| commit | 175ebb010477ff0e174fe5145154397f43dee2d2 (patch) | |
| tree | 4c6fb9aee070622642bac451b90b8fa8aa6fae0e /src | |
| parent | ef76e64427bb980cca23c338df2526766431ea52 (diff) | |
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')
| -rw-r--r-- | src/pgtkfns.c | 3 |
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; static double pgtk_get_monitor_scale_factor (const char *model) { + if (model == NULL) + return 0.0; + Lisp_Object mdl = build_string (model); Lisp_Object tem = Fassoc(mdl, monitor_scale_factor_alist, Qnil); if (NILP (tem)) |