diff options
| author |  Simon Ser <contact@emersion.fr> | 2022-05-26 21:24:46 +0200 |
|---|---|---|
| committer |  Simon Zeni <simon@bl4ckb0ne.ca> | 2022-05-26 15:42:56 -0400 |
| commit | d0b9bf94a5c6e88b13c6fa7f9b41af0a94ea1a3e (patch) | |
| tree | 7cd4e2a3d36becffe8c72ddcc3bac3ecb20216ec /sway/config/output.c | |
| parent | De-duplicate IPC output descriptions (diff) | |
| download | sway-d0b9bf94a5c6e88b13c6fa7f9b41af0a94ea1a3e.tar.gz sway-d0b9bf94a5c6e88b13c6fa7f9b41af0a94ea1a3e.tar.zst sway-d0b9bf94a5c6e88b13c6fa7f9b41af0a94ea1a3e.zip | |
Handle NULL output make/model/serial
Diffstat (limited to 'sway/config/output.c')
| -rw-r--r-- | sway/config/output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 88514ac0..aa4cf946 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
| @@ -27,8 +27,10 @@ int output_name_cmp(const void *item, const void *data) { | |||
| 27 | void output_get_identifier(char *identifier, size_t len, | 27 | void output_get_identifier(char *identifier, size_t len, |
| 28 | struct sway_output *output) { | 28 | struct sway_output *output) { |
| 29 | struct wlr_output *wlr_output = output->wlr_output; | 29 | struct wlr_output *wlr_output = output->wlr_output; |
| 30 | snprintf(identifier, len, "%s %s %s", wlr_output->make, wlr_output->model, | 30 | snprintf(identifier, len, "%s %s %s", |
| 31 | wlr_output->serial); | 31 | wlr_output->make ? wlr_output->make : "Unknown", |
| 32 | wlr_output->model ? wlr_output->model : "Unknown", | ||
| 33 | wlr_output->serial ? wlr_output->serial : "Unknown"); | ||
| 32 | } | 34 | } |
| 33 | 35 | ||
| 34 | const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter) { | 36 | const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter) { |