echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Prevent editing a client while it's starting

Browse Source
This commit is contained in:
zzz
2019-05-13 14:44:35 +00:00
parent 8840532ed0
commit 05318013e2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigClientsHelper.java
View File

@ -140,13 +140,16 @@ public class ConfigClientsHelper extends HelperBase {
boolean isConsole = ca.className.equals("net.i2p.router.web.RouterConsoleRunner"); boolean isConsole = ca.className.equals("net.i2p.router.web.RouterConsoleRunner");
boolean showStart; boolean showStart;
boolean showStop; boolean showStop;
boolean showEdit;
if (isConsole) { if (isConsole) {
showStart = false; showStart = false;
showStop = false; showStop = false;
showEdit = true;
} else { } else {
ClientApp clientApp = _context.routerAppManager().getClientApp(ca.className, LoadClientAppsJob.parseArgs(ca.args)); ClientApp clientApp = _context.routerAppManager().getClientApp(ca.className, LoadClientAppsJob.parseArgs(ca.args));
showStart = clientApp == null; showStart = clientApp == null;
showStop = clientApp != null && clientApp.getState() == ClientAppState.RUNNING; showStop = clientApp != null && clientApp.getState() == ClientAppState.RUNNING;
showEdit = !showStop && (clientApp == null || clientApp.getState() != ClientAppState.STARTING);
} }
String scur = Integer.toString(cur); String scur = Integer.toString(cur);
renderForm(buf, scur, ca.clientName, renderForm(buf, scur, ca.clientName,
@ -161,8 +164,9 @@ public class ConfigClientsHelper extends HelperBase {
// edit // edit
allowEdit && scur.equals(_edit), allowEdit && scur.equals(_edit),
// show edit button, show update button // show edit button, show update button
// Don't allow edit if it's running, or else we would lose the "handle" to the ClientApp to stop it. // Don't allow edit if it's running or starting, or else we would lose the "handle" to the ClientApp to stop it.
allowEdit && !showStop, false, allowEdit && showEdit,
false,
// show stop button // show stop button
showStop, showStop,
// show delete button, show start button // show delete button, show start button