From 86e9ff3e44829564d27f3df4677e1bb83828c248 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 8 May 2025 13:06:27 +0900 Subject: [PATCH] Fix runtime shutdown problem with GajuDesk --- ebin/gajudesk.app | 2 +- src/gajudesk.erl | 2 +- src/gd_con.erl | 11 ++++++++--- src/gd_grids.erl | 2 +- src/gd_gui.erl | 2 +- src/gd_jt.erl | 2 +- src/gd_sophia_editor.erl | 2 +- src/gd_sup.erl | 2 +- src/gd_v.erl | 2 +- src/gd_v_devman.erl | 2 +- src/gd_v_netman.erl | 2 +- src/gd_v_wallman.erl | 2 +- zomp.meta | 4 ++-- 13 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ebin/gajudesk.app b/ebin/gajudesk.app index 96d25f5..fff44f0 100644 --- a/ebin/gajudesk.app +++ b/ebin/gajudesk.app @@ -3,7 +3,7 @@ {registered,[]}, {included_applications,[]}, {applications,[stdlib,kernel,sasl,ssl]}, - {vsn,"0.6.0"}, + {vsn,"0.6.1"}, {modules,[gajudesk,gd_con,gd_grids,gd_gui,gd_jt, gd_sophia_editor,gd_sup,gd_v,gd_v_devman,gd_v_netman, gd_v_wallman]}, diff --git a/src/gajudesk.erl b/src/gajudesk.erl index c81c799..f7bdb22 100644 --- a/src/gajudesk.erl +++ b/src/gajudesk.erl @@ -3,7 +3,7 @@ %%% @end -module(gajudesk). --vsn("0.6.0"). +-vsn("0.6.1"). -behavior(application). -author("Craig Everett "). -copyright("QPQ AG "). diff --git a/src/gd_con.erl b/src/gd_con.erl index ee25e95..b9bcb45 100644 --- a/src/gd_con.erl +++ b/src/gd_con.erl @@ -3,7 +3,7 @@ %%% @end -module(gd_con). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). @@ -455,7 +455,6 @@ handle_cast({set_sole_node, TheOneTrueNode}, State) -> {noreply, NewState}; handle_cast(stop, State) -> NewState = do_stop(State), - ok = zx:stop(), {noreply, NewState}; handle_cast(Unexpected, State) -> ok = tell(warning, "Unexpected cast: ~tp~n", [Unexpected]), @@ -1049,7 +1048,13 @@ do_password(Old, New, State = #s{pass = Pass}) -> do_stop(State = #s{prefs = Prefs}) -> ok = persist(Prefs), - do_close_wallet(State). + NewState = do_close_wallet(State), + ok = + case is_pid(whereis(gmc_con)) of + false -> zx:stop(); + true -> application:stop(gajudesk) + end, + NewState. do_new_wallet(Name, Path, Password, State = #s{wallets = Wallets, prefs = Prefs}) -> diff --git a/src/gd_grids.erl b/src/gd_grids.erl index ebcc6e1..021e711 100644 --- a/src/gd_grids.erl +++ b/src/gd_grids.erl @@ -37,7 +37,7 @@ %%% @end -module(gd_grids). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/src/gd_gui.erl b/src/gd_gui.erl index ecb45e4..2ba931a 100644 --- a/src/gd_gui.erl +++ b/src/gd_gui.erl @@ -3,7 +3,7 @@ %%% @end -module(gd_gui). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/src/gd_jt.erl b/src/gd_jt.erl index a069f75..6646254 100644 --- a/src/gd_jt.erl +++ b/src/gd_jt.erl @@ -15,7 +15,7 @@ %%% translation library is retained). -module(gd_jt). --vsn("0.6.0"). +-vsn("0.6.1"). -export([read_translations/1, j/2, oneshot_j/2]). diff --git a/src/gd_sophia_editor.erl b/src/gd_sophia_editor.erl index 09ea024..11fd514 100644 --- a/src/gd_sophia_editor.erl +++ b/src/gd_sophia_editor.erl @@ -1,5 +1,5 @@ -module(gd_sophia_editor). --vsn("0.6.0"). +-vsn("0.6.1"). -export([new/1, update/2, get_text/1, set_text/2]). diff --git a/src/gd_sup.erl b/src/gd_sup.erl index ad219fe..841ab60 100644 --- a/src/gd_sup.erl +++ b/src/gd_sup.erl @@ -12,7 +12,7 @@ %%% @end -module(gd_sup). --vsn("0.6.0"). +-vsn("0.6.1"). -behaviour(supervisor). -author("Craig Everett "). -copyright("QPQ AG "). diff --git a/src/gd_v.erl b/src/gd_v.erl index c7eaf29..7777d3d 100644 --- a/src/gd_v.erl +++ b/src/gd_v.erl @@ -1,5 +1,5 @@ -module(gd_v). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/src/gd_v_devman.erl b/src/gd_v_devman.erl index 39627ea..df89c7f 100644 --- a/src/gd_v_devman.erl +++ b/src/gd_v_devman.erl @@ -1,5 +1,5 @@ -module(gd_v_devman). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/src/gd_v_netman.erl b/src/gd_v_netman.erl index 2e5caed..9b5fcfe 100644 --- a/src/gd_v_netman.erl +++ b/src/gd_v_netman.erl @@ -1,5 +1,5 @@ -module(gd_v_netman). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/src/gd_v_wallman.erl b/src/gd_v_wallman.erl index 148a56f..397b16a 100644 --- a/src/gd_v_wallman.erl +++ b/src/gd_v_wallman.erl @@ -1,5 +1,5 @@ -module(gd_v_wallman). --vsn("0.6.0"). +-vsn("0.6.1"). -author("Craig Everett "). -copyright("QPQ AG "). -license("GPL-3.0-or-later"). diff --git a/zomp.meta b/zomp.meta index 16b2e7f..cae4284 100644 --- a/zomp.meta +++ b/zomp.meta @@ -2,9 +2,9 @@ {type,gui}. {modules,[]}. {prefix,"gd"}. -{desc,"A desktop client for the Gajumaru network of blockchain networks"}. {author,"Craig Everett"}. -{package_id,{"otpr","gajudesk",{0,6,0}}}. +{desc,"A desktop client for the Gajumaru network of blockchain networks"}. +{package_id,{"otpr","gajudesk",{0,6,1}}}. {deps,[{"otpr","hakuzaru",{0,6,1}}, {"otpr","eblake2",{1,0,1}}, {"otpr","base58",{0,1,1}},