diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-07-18 14:34:56 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-07-18 14:35:16 +0200 |
| commit | 48f4715d1cfe3c1dc39533ff5d2441399b769ae9 (patch) | |
| tree | 310505010a9548091554ea64a59c52ebdf731577 | |
| parent | Move disconnect and reconnect to servers/crtc.c, but keep gamma reapplication in servers/gamma.c (diff) | |
| download | coopgammad-48f4715d1cfe3c1dc39533ff5d2441399b769ae9.tar.gz coopgammad-48f4715d1cfe3c1dc39533ff5d2441399b769ae9.tar.bz2 coopgammad-48f4715d1cfe3c1dc39533ff5d2441399b769ae9.tar.xz | |
bug fix
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | src/coopgammad.c | 1 | ||||
| -rw-r--r-- | src/servers/crtc.c | 2 | ||||
| -rw-r--r-- | src/state.c | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/coopgammad.c b/src/coopgammad.c index f46957e..8cbc616 100644 --- a/src/coopgammad.c +++ b/src/coopgammad.c @@ -355,7 +355,6 @@ static enum init_status initialise(int full, int preserve, int foreground, int k goto fail; if (initialise_gamma_info() < 0) goto fail; - free(crtcs), crtcs = NULL; /* Sort outputs */ qsort(outputs, outputs_n, sizeof(*outputs), output_cmp_by_name); diff --git a/src/servers/crtc.c b/src/servers/crtc.c index 41056bf..df274f8 100644 --- a/src/servers/crtc.c +++ b/src/servers/crtc.c @@ -207,8 +207,8 @@ int disconnect(void) { if (!connected) return 0; - connected = 0; + return 0; /* TODO disconnect() */ } diff --git a/src/state.c b/src/state.c index a7fd57f..0a0a369 100644 --- a/src/state.c +++ b/src/state.c @@ -155,11 +155,7 @@ void state_destroy(void) if (outputs != NULL) for (i = 0; i < outputs_n; i++) - { - if (crtcs == NULL) - libgamma_crtc_destroy(outputs[i].crtc + i); - output_destroy(outputs + i); - } + output_destroy(outputs + i); free(outputs); if (crtcs != NULL) for (i = 0; i < outputs_n; i++) |