diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-07-10 20:41:02 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-10 20:41:02 +1000 |
| commit | 56ad148403d77a6defcbd6cd383dd5cde1a44954 (patch) | |
| tree | 9dc36287be4bed02c4e98e600f26f48ceff5d8d6 /common/util.c | |
| parent | Fix titlebar rendering for nested stacked containers (diff) | |
| parent | Merge pull request #2228 from emersion/focus-mode-toggle (diff) | |
| download | sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.gz sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.tar.zst sway-56ad148403d77a6defcbd6cd383dd5cde1a44954.zip | |
Merge branch 'master' into fix-stacked-layout
Diffstat (limited to 'common/util.c')
| -rw-r--r-- | common/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/util.c b/common/util.c index 678926ed..e8a88772 100644 --- a/common/util.c +++ b/common/util.c | |||
| @@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) { | |||
| 113 | 113 | ||
| 114 | int len = strlen(color); | 114 | int len = strlen(color); |
| 115 | if (len != 6 && len != 8) { | 115 | if (len != 6 && len != 8) { |
| 116 | wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); | 116 | wlr_log(WLR_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); |
| 117 | return 0xFFFFFFFF; | 117 | return 0xFFFFFFFF; |
| 118 | } | 118 | } |
| 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); | 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); |