aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/coopgammad.c1
-rw-r--r--src/servers/crtc.c2
-rw-r--r--src/state.c6
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++)