1 files changed, 9 insertions, 1 deletions

diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index ccda1963..7975366e 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -1,4 +1,5 @@
 #define _POSIX_C_SOURCE 200809L
+#include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -316,7 +317,14 @@ static void transaction_commit(struct sway_transaction *transaction) {
                 // Set up a timer which the views must respond within
                 transaction->timer = wl_event_loop_add_timer(server.wl_event_loop,
                                 handle_timeout, transaction);
-                wl_event_source_timer_update(transaction->timer, txn_timeout_ms);
+                if (transaction->timer) {
+                        wl_event_source_timer_update(transaction->timer, txn_timeout_ms);
+                } else {
+                        wlr_log(WLR_ERROR, "Unable to create transaction timer (%s). "
+                                        "Some imperfect frames might be rendered.",
+                                        strerror(errno));
+                        handle_timeout(transaction);
+                }
         }
 
         // The debug tree shows the pending/live tree. Here is a good place to