diff options
| author | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
| commit | b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa (patch) | |
| tree | 0f4bce1eb128326affdaacaeb0b2de2ac19860f8 /lib/reltool/src/reltool_app_win.erl | |
| parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
| parent | 38f068341ebf04e5d6bf5eff7fb01e44bce228b6 (diff) | |
| download | otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.gz otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.bz2 otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.zip | |
Merge branch 'siri/reltool/app-level-lib-dir/OTP-9977' into maint
* siri/reltool/app-level-lib-dir/OTP-9977:
[reltool] Allow lib_dir on app level to use relative path
[reltool] Add configuration parameter lib_dir on application level
Diffstat (limited to 'lib/reltool/src/reltool_app_win.erl')
| -rw-r--r-- | lib/reltool/src/reltool_app_win.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl index e0acfab7aa..6cd0d2f90b 100644 --- a/lib/reltool/src/reltool_app_win.erl +++ b/lib/reltool/src/reltool_app_win.erl @@ -611,7 +611,7 @@ handle_event(#state{sys = Sys, app = App} = S, Wx) -> redraw_window(S2); #wx{userData = use_selected_vsn} -> %% Use selected version - App2 = App#app{use_selected_vsn = true}, + App2 = App#app{use_selected_vsn = dir}, {ok, App3} = reltool_sys_win:set_app(S#state.parent_pid, App2), S2 = S#state{app = App3}, redraw_window(S2); @@ -619,7 +619,8 @@ handle_event(#state{sys = Sys, app = App} = S, Wx) -> event = #wxCommand{type = command_radiobox_selected, cmdString = ActiveDir}} -> %% Change app source - S2 = change_version(S, App, ActiveDir), + App2 = App#app{use_selected_vsn = dir}, + S2 = change_version(S, App2, ActiveDir), redraw_window(S2); #wx{userData = {mod_button, Action, ListCtrl}, event = #wxCommand{type = command_button_clicked}} -> @@ -942,11 +943,11 @@ redraw_config(#state{sys = #sys{incl_cond = GlobalIncl, LatestRadio, SelectedRadio, SourceBox, - fun(true) -> + fun(false) -> + 0; + (_) -> reltool_utils:elem_to_index(ActiveDir, - SortedDirs) - 1; - (false) -> - 0 + SortedDirs) - 1 end). redraw_double_box(Global, Local, GlobalRadio, LocalRadio, LocalBox, GetChoice) -> |