xdg/gconf: Fix return to always set appropriate error

Signed-off-by: Ikey Doherty <[email protected]>
solus-project · Nov 29, 2017 · dc3f918 · dc3f918
1 parent 1dc0324
commit dc3f918
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/handlers/xdg/gconf.c b/src/handlers/xdg/gconf.c
@@ -99,12 +99,12 @@ static UscHandlerStatus usc_handler_gconf_exec_internal(UscContext *ctx, const c
         if (r != 0) {
                 usc_context_emit_task_finish(ctx, USC_HANDLER_FAIL);
                 ret = USC_HANDLER_FAIL | USC_HANDLER_BREAK;
+        } else {
+                usc_context_emit_task_finish(ctx, USC_HANDLER_SUCCESS);
+                ret = USC_HANDLER_SUCCESS | USC_HANDLER_BREAK;
         }
-        unsetenv("GCONF_CONFIG_SOURCE");
-        usc_context_emit_task_finish(ctx, USC_HANDLER_SUCCESS);
-
-        ret = USC_HANDLER_SUCCESS | USC_HANDLER_BREAK;
 
+        unsetenv("GCONF_CONFIG_SOURCE");
 done:
         globfree(&schemas);
         return ret;