]> git.mdlowis.com Git - proto/labwc.git/commitdiff
rcxml: avoid crash when checking environment for WLR_DRM_NO_ATOMIC
authorAndrew J. Hesford <ajh@sideband.org>
Mon, 8 Jan 2024 23:19:12 +0000 (18:19 -0500)
committerAndrew J. Hesford <48421688+ahesford@users.noreply.github.com>
Tue, 9 Jan 2024 00:28:03 +0000 (19:28 -0500)
src/config/rcxml.c

index fd6fd0433704c56808afe95d735f31db414f1cf9..335374234d181cd04abdc246fe2df51f4c9d1994 100644 (file)
@@ -742,9 +742,12 @@ entry(xmlNode *node, char *nodename, char *content)
                set_adaptive_sync_mode(content, &rc.adaptive_sync);
        } else if (!strcasecmp(nodename, "allowTearing.core")) {
                set_bool(content, &rc.allow_tearing);
-               if (rc.allow_tearing && strcmp(getenv("WLR_DRM_NO_ATOMIC"), "1")) {
-                       rc.allow_tearing = false;
-                       wlr_log(WLR_INFO, "WLR_DRM_NO_ATOMIC is not 1, tearing disabled");
+               if (rc.allow_tearing) {
+                       char *no_atomic_env = getenv("WLR_DRM_NO_ATOMIC");
+                       if (!no_atomic_env || strcmp(no_atomic_env, "1") != 0) {
+                               rc.allow_tearing = false;
+                               wlr_log(WLR_ERROR, "tearing requires WLR_DRM_NO_ATOMIC=1");
+                       }
                }
        } else if (!strcasecmp(nodename, "reuseOutputMode.core")) {
                set_bool(content, &rc.reuse_output_mode);