client
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java'
+++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java
@@ -135,32 +135,32 @@ public class ActionBox extends StackPane
{
if(action!=null)
{
- if(!getActionGridPaneListener().isConnected())
+ if(action.getActionType() == ActionType.FOLDER)
{
- try
+ getActionGridPaneListener().renderFolder(action.getID());
+ }
+ else
+ {
+ if(!getActionGridPaneListener().isConnected())
{
- if(Config.getInstance().isTryConnectingWhenActionClicked())
+ try
{
- clientListener.setupClientConnection(this::actionClicked);
+ if(Config.getInstance().isTryConnectingWhenActionClicked())
+ {
+ clientListener.setupClientConnection(this::actionClicked);
+ }
+ else
+ {
+ exceptionAndAlertHandler.onAlert("Not Connected", "Not Connected to any Server", StreamPiAlertType.ERROR);
+ }
+ return;
}
- else
+ catch (SevereException e)
{
- exceptionAndAlertHandler.onAlert("Not Connected", "Not Connected to any Server", StreamPiAlertType.ERROR);
+ exceptionAndAlertHandler.handleSevereException(e);
}
- return;
- }
- catch (SevereException e)
- {
- exceptionAndAlertHandler.handleSevereException(e);
}
- }
- if(action.getActionType() == ActionType.FOLDER)
- {
- getActionGridPaneListener().renderFolder(action.getID());
- }
- else
- {
if(action.getActionType() == ActionType.COMBINE)
{
getActionGridPaneListener().combineActionClicked(action.getID());