From a3b384e883441214a82187cb88f6d2e63cbc2006 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 28 Dec 2018 16:41:37 +0100
Subject: [PATCH] Recognize new config dir structure when importing configs
 (RIDER-23135)

---
 .../com/intellij/openapi/application/ConfigImportHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
index 5d90a527d952..b423083e7328 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
@@ -194,7 +194,7 @@ public class ConfigImportHelper {
   }
 
   private static boolean isValidConfigDir(File candidate) {
-    return new File(candidate, OPTIONS_XML).isFile();
+    return new File(candidate, OPTIONS_XML).isFile() || new File(candidate, "options/ide.general.xml").isFile();
   }
 
   @Nullable