aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
commitf55e65808c86d4a4c49e0777af6ecae7d3a107df (patch)
tree57d244881467b30488f384a7d5e38c839ec64830 /main.c
parentselection: offer clipboard content in more mime types (diff)
parentconfig: replace union in config struct with simple width/height members (diff)
Merge branch 'simplify-config-struct'
Diffstat (limited to 'main.c')
-rw-r--r--main.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/main.c b/main.c
index ebd73f20..ab595d22 100644
--- a/main.c
+++ b/main.c
@@ -399,18 +399,8 @@ main(int argc, char *const *argv)
}
if (conf_width > 0 && conf_height > 0) {
conf.size.type = conf_size_type;
-
- switch (conf_size_type) {
- case CONF_SIZE_PX:
- conf.size.px.width = conf_width;
- conf.size.px.height = conf_height;
- break;
-
- case CONF_SIZE_CELLS:
- conf.size.cells.width = conf_width;
- conf.size.cells.height = conf_height;
- break;
- }
+ conf.size.width = conf_width;
+ conf.size.height = conf_height;
}
if (conf_server_socket_path != NULL) {
free(conf.server_socket_path);