Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan McGovern <alan.mcgovern@gmail.com>2012-01-05 22:46:07 +0400
committerAlan McGovern <alan.mcgovern@gmail.com>2012-01-05 22:49:20 +0400
commit300dfb25cd470268e6cd9a6cb93fd8fe576c957a (patch)
treedff22ca9240b8d9e192af6d31007166a162f5b0e
parent92a90a19cacf527bac910e94c3ea609c9788c691 (diff)
[Ide] Revert 219a0f8c
This behaviour is what we want in #2739.
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs3
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs12
2 files changed, 3 insertions, 12 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
index 6529337d08..2ff56dfc65 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
@@ -47,9 +47,6 @@ namespace MonoDevelop.Ide
public static void ShowFeedbackWindow ()
{
- if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("MONODEVELOP_CRASHREPORTER_TEST")))
- throw new Exception ();
-
if (currentFeedbackDialog == null) {
var p = FeedbackPositionGetter ();
currentFeedbackDialog = new FeedbackDialog (p.X, p.Y);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs
index 1f92d7e9c1..205309e01e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/LogReportingStartup.cs
@@ -58,15 +58,9 @@ namespace MonoDevelop.Ide
? GettextCatalog.GetString ("A fatal error has occurred")
: GettextCatalog.GetString ("An error has occurred");
- if (!ShouldPromptToOptIn && enabled.HasValue) {
- if (enabled.Value) {
- message = GettextCatalog.GetString (
- "Details of this error have been automatically sent to Xamarin for analysis.");
- } else {
- message = GettextCatalog.GetString (
- "Details of this error have not been sent to Xamarin for analysis as crash diagnostics " +
- "have been disabled.");
- }
+ if (!ShouldPromptToOptIn && enabled.GetValueOrDefault ()) {
+ message = GettextCatalog.GetString (
+ "Details of this error have been automatically sent to Xamarin for analysis.");
if (willShutdown) {
message += GettextCatalog.GetString (" {0} will now close.", BrandingService.ApplicationName);
}