Skip to content

Avoid creating RunContentManager #4271

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

Merged
merged 1 commit into from
Jan 9, 2020
Merged

Avoid creating RunContentManager #4271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions src/io/flutter/run/FlutterAppManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ public void dispose() {
*/
@Nullable
public FlutterApp getActiveApp() {
final RunContentDescriptor descriptor = getRunContentManager().getSelectedContent();
RunContentManager mgr = getRunContentManager();
if (mgr == null) {
return null;
}
final RunContentDescriptor descriptor = mgr.getSelectedContent();
if (descriptor == null) {
return null;
}
Expand All @@ -84,9 +88,12 @@ public EventStream<FlutterApp> getActiveAppAsStream() {
*/
public List<FlutterApp> getApps() {
final List<FlutterApp> apps = new ArrayList<>();
RunContentManager mgr = getRunContentManager();
if (mgr == null) {
return apps;
}

final List<RunContentDescriptor> runningProcesses =
getRunContentManager().getAllDescriptors();
final List<RunContentDescriptor> runningProcesses = mgr.getAllDescriptors();
for (RunContentDescriptor descriptor : runningProcesses) {
final ProcessHandler process = descriptor.getProcessHandler();
if (process != null) {
Expand All @@ -109,7 +116,13 @@ private void updateActiveApp() {
}
}

@Nullable
private RunContentManager getRunContentManager() {
// Creating a RunContentManager causes a blank window to appear, so don't create it here.
// See https://github.com/flutter/flutter-intellij/issues/4217
if (ServiceManager.getServiceIfCreated(project, RunContentManager.class) == null) {
return null;
}
return ExecutionManager.getInstance(project).getContentManager();
}
}