Fix runtime shutdown problem with GajuDesk

This commit is contained in:
Craig Everett 2025-05-08 13:06:27 +09:00
parent 57a81e7f3f
commit 86e9ff3e44
13 changed files with 21 additions and 16 deletions

View File

@ -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]},

View File

@ -3,7 +3,7 @@
%%% @end
-module(gajudesk).
-vsn("0.6.0").
-vsn("0.6.1").
-behavior(application).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").

View File

@ -3,7 +3,7 @@
%%% @end
-module(gd_con).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-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}) ->

View File

@ -37,7 +37,7 @@
%%% @end
-module(gd_grids).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -3,7 +3,7 @@
%%% @end
-module(gd_gui).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -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]).

View File

@ -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]).

View File

@ -12,7 +12,7 @@
%%% @end
-module(gd_sup).
-vsn("0.6.0").
-vsn("0.6.1").
-behaviour(supervisor).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").

View File

@ -1,5 +1,5 @@
-module(gd_v).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -1,5 +1,5 @@
-module(gd_v_devman).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -1,5 +1,5 @@
-module(gd_v_netman).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -1,5 +1,5 @@
-module(gd_v_wallman).
-vsn("0.6.0").
-vsn("0.6.1").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").

View File

@ -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}},