diff options
| author | Drew DeVault <[email protected]> | 2018-08-19 10:29:29 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-19 10:29:29 -0400 |
| commit | 9f913614cad6d157bbf33b012093dda6f3e7665e (patch) | |
| tree | fd63244ea01baecc425fb8f3b159975beb5a31e5 /sway/server.c | |
| parent | 2c91afbb34f649fcd4de690be5bedba4d989a7f0 (diff) | |
| parent | f9563d88f30fd70c5999520fa7f4b3d0dffd1a4c (diff) | |
Merge pull request #2478 from RyanDwyer/standardise-debug
Standardise debug variables
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index e8dc63be..00acaa01 100644 --- a/sway/server.c +++ b/sway/server.c @@ -128,10 +128,11 @@ bool server_init(struct sway_server *server) { return false; } - const char *debug = getenv("SWAY_DEBUG"); - if (debug != NULL && strcmp(debug, "txn_timings") == 0) { - server->debug_txn_timings = true; + // This may have been set already via -Dtxn-timeout + if (!server->txn_timeout_ms) { + server->txn_timeout_ms = 200; } + server->dirty_containers = create_list(); server->transactions = create_list(); |