[EGIT] [apps/evisum] master 01/01: init/shutdown: fix.

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/apps/evisum.git/commit/?id=db9b8a73a76e34d41540d6c514455140b33339cd

commit db9b8a73a76e34d41540d6c514455140b33339cd
Author: Alastair Poole <nets...@gmail.com>
Date:   Fri Sep 11 13:52:50 2020 +0100

    init/shutdown: fix.
    
    Queue a restart. Make config checking less aggressive.
---
 src/bin/evisum_config.c | 4 ++--
 src/bin/main.c          | 3 ---
 src/bin/ui/ui.c         | 2 +-
 src/bin/ui/ui.h         | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/bin/evisum_config.c b/src/bin/evisum_config.c
index e82792a..8895066 100644
--- a/src/bin/evisum_config.c
+++ b/src/bin/evisum_config.c
@@ -79,8 +79,6 @@ config_load(void)
         if (!f) _config_fail("read");
         cfg = eet_read(f, "Config", &size);
 
-        _config_check(cfg);
-
         if (cfg->version < CONFIG_VERSION)
           {
              free(cfg);
@@ -88,6 +86,8 @@ config_load(void)
 
              cfg = _config_init();
           }
+        _config_check(cfg);
+
         eet_close(f);
      }
 
diff --git a/src/bin/main.c b/src/bin/main.c
index 974779f..7961548 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -99,7 +99,6 @@ int
 main(int argc, char **argv)
 {
    Ui *ui;
-   Eina_Bool restart = EINA_FALSE;
    int i;
 
    for (i = 0; i < argc; i++)
@@ -136,9 +135,7 @@ main(int argc, char **argv)
    if (ui)
      {
         ecore_main_loop_begin();
-        restart = ui->restart;
         evisum_ui_del(ui);
-        if (restart) ecore_exe_run("evisum", NULL);
      }
 
    elm_shutdown();
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 12e428a..232ef96 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -1098,7 +1098,7 @@ _menu_effects_clicked_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
    evisum_ui_effects_enabled_set(!evisum_ui_effects_enabled_get());
 
    _config_save(ui);
-   ui->restart = EINA_TRUE;
+   ecore_app_restart();
    ecore_main_loop_quit();
 }
 
diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h
index e6d6ab5..80d8278 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/ui.h
@@ -90,7 +90,6 @@ typedef struct Ui
    Eina_Bool       sort_reverse;
    Eina_Bool       show_self;
    Eina_Bool       shutdown_now;
-   Eina_Bool       restart;
 
    Ecore_Animator *animator;
    Eina_Bool       zfs_mounted;

--