If we edit project view and not triggered Sync, on project reopening …

…the wrong load project data load will be attempted to be attempted to load. (#7134)

base/src/com/google/idea/blaze/base/sync/BlazeSyncStartupActivity.java

@@ -38,16 +38,18 @@ public void runActivity(Project project) {
     if (importSettings == null) {
       return;
     }
-    if (Blaze.getUpToDateProjectTypeBeforeSync(project) == ProjectType.QUERY_SYNC) {
+    ProjectType initialProjectType = importSettings.getProjectType();
+    ProjectType currentProjectType = Blaze.getUpToDateProjectTypeBeforeSync(project);
+    if (currentProjectType == ProjectType.QUERY_SYNC) {
       // When query sync is not enabled hasProjectData triggers the load
       QuerySyncManager.getInstance(project)
           .onStartup(QuerySyncActionStatsScope.create(getClass(), null));
-      return;
-    }
-    if (hasProjectData(project, importSettings)) {
-      BlazeSyncManager.getInstance(project).requestProjectSync(startupSyncParams());
     } else {
-      BlazeSyncManager.getInstance(project).incrementalProjectSync(SYNC_REASON);
+      if (initialProjectType == currentProjectType && hasProjectData(project, importSettings)) {
+        BlazeSyncManager.getInstance(project).requestProjectSync(startupSyncParams());
+      } else {
+        BlazeSyncManager.getInstance(project).incrementalProjectSync(SYNC_REASON);
+      }
     }
   }