From 80eaa69e020add9cbbf6970ccad42aef89949219 Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Thu, 13 Feb 2014 12:42:18 +0400 Subject: [PATCH] isModified() fixed --- .../ide/browsers/chrome/ChromeSettingsConfigurable.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java index 9e8b681b1b1d..5cc4167f97d7 100644 --- a/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java +++ b/platform/platform-api/src/com/intellij/ide/browsers/chrome/ChromeSettingsConfigurable.java @@ -21,6 +21,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.RawCommandLineEditor; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -66,7 +67,7 @@ public class ChromeSettingsConfigurable implements Configurable { @Override public boolean isModified() { if (myUseCustomProfileCheckBox.isSelected() != mySettings.isUseCustomProfile() - || !myCommandLineOptionsEditor.getText().equals(mySettings.getCommandLineOptions())) { + || !myCommandLineOptionsEditor.getText().equals(StringUtil.notNullize(mySettings.getCommandLineOptions()))) { return true; } @@ -98,7 +99,7 @@ public class ChromeSettingsConfigurable implements Configurable { myUserDataDirField.setText(FileUtil.toSystemDependentName(path)); } else { - myUserDataDirField.setText(myDefaultUserDirPath); + myUserDataDirField.setText(FileUtil.toSystemDependentName(myDefaultUserDirPath)); } } @@ -111,10 +112,10 @@ public class ChromeSettingsConfigurable implements Configurable { private static String getDefaultUserDataPath() { File dir = new File(PathManager.getConfigPath(), "chrome-user-data"); try { - return dir.getCanonicalPath(); + return FileUtil.toSystemIndependentName(dir.getCanonicalPath()); } catch (IOException e) { - return dir.getAbsolutePath(); + return FileUtil.toSystemIndependentName(dir.getAbsolutePath()); } }