Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't create the welcome if a layout was passed #2162

Closed
wants to merge 2 commits into from
Closed

Don't create the welcome if a layout was passed #2162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e5404
Don't create the welcome if a layout was passed
mgotz Mar 7, 2022
b02a4d7
Order matters: last change prevented any layouts from being loaded
mgotz Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ private void startUI(final MementoTree memento, final JobMonitor monitor) throws
// If there's nothing to restore from a previous instance,
// start with welcome
monitor.updateTaskName(Messages.MonitorTaskTabs);
if (!application_parameters.contains("-clean") && !restoreState(memento))
if (!application_parameters.contains("-clean") && !restoreState(memento) && !application_parameters.remove("-layout"))
new Welcome().create();
monitor.worked(1);

Expand Down Expand Up @@ -1062,9 +1062,8 @@ private MementoTree loadDefaultMemento(final List<String> parameters, final JobM
if (i >= parameters.size() - 1)
throw new Exception("Missing /path/to/Example.memento for -layout option");
memfile = new File(parameters.get(i + 1));
// Remove -layout and path because they have been handled
// Remove path because it has been been handled, keep -layout to decide on welcome
parameters.remove(i + 1);
parameters.remove(i);
break;
}
if (memfile.canRead()) {
Expand Down