diff options
author | Alan McGovern <alan.mcgovern@gmail.com> | 2011-10-06 13:42:06 +0400 |
---|---|---|
committer | Alan McGovern <alan.mcgovern@gmail.com> | 2011-10-06 13:42:06 +0400 |
commit | 08ff2577eb5bb643d633b60761cdb3a8af454db1 (patch) | |
tree | 640a3a2be6255624cef3096d853eb9866e37d3cf /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui | |
parent | d8e3f43e68df54e511c7c7c4dee89770f36c4883 (diff) |
[Ide] The default action should be to not migrate projects
If we get an unexpected response from the dialog asking if the project
should be migrated, we should default to DoNotMigrate, not BackupAndMigrate.
Fixes bug #1295.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs index e599cdae75..4b336332d1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectLoadProgressMonitor.cs @@ -45,7 +45,7 @@ namespace MonoDevelop.Ide.Gui { if (Migration.HasValue) return Migration.Value; - + var buttonBackupAndMigrate = new AlertButton (GettextCatalog.GetString ("Back up and migrate")); var buttonMigrate = new AlertButton (GettextCatalog.GetString ("Migrate")); var buttonIgnore = new AlertButton (GettextCatalog.GetString ("Ignore")); @@ -58,13 +58,15 @@ namespace MonoDevelop.Ide.Gui "If you choose to back up the project before migration, a copy of the project " + "file will be saved in a 'backup' directory in the project directory."), buttonIgnore, buttonMigrate, buttonBackupAndMigrate); - if (response == buttonIgnore) - Migration = MigrationType.Ignore; + + // If we get an unexpected response, the default should be to *not* migrate + if (response == buttonBackupAndMigrate) + Migration = MigrationType.BackupAndMigrate; else if (response == buttonMigrate) Migration = MigrationType.Migrate; - else - Migration = MigrationType.BackupAndMigrate; - + else + Migration = MigrationType.Ignore; + return Migration.Value; } } |