Skip to content

Commit 2853d24

Browse files
authored
Fix project settings resetting on domain reload (#678)
* Fix build on Windows * Don't save setting on each plugin init * Revert "Fix build on Windows" This reverts commit ff03ffd. * Fix code style
1 parent 7a81c64 commit 2853d24

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

source/IOSResolver/src/IOSResolver.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ private static Assembly ResolveUnityEditoriOSXcodeExtension(
724724
/// </summary>
725725
static IOSResolver() {
726726
// Load log preferences.
727-
VerboseLoggingEnabled = VerboseLoggingEnabled;
727+
UpdateLoggerLevel(VerboseLoggingEnabled);
728728

729729
// NOTE: We can't reference the UnityEditor.iOS.Xcode module in this
730730
// method as the Mono runtime in Unity 4 and below requires all
@@ -1039,10 +1039,14 @@ public static bool VerboseLoggingEnabled {
10391039
get { return settings.GetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, defaultValue: false); }
10401040
set {
10411041
settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value);
1042-
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
1042+
UpdateLoggerLevel(value);
10431043
}
10441044
}
10451045

1046+
private static void UpdateLoggerLevel(bool verboseLoggingEnabled) {
1047+
logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info;
1048+
}
1049+
10461050
/// <summary>
10471051
/// Skip pod install when using workspace integration, let user manually run it.
10481052
/// </summary>

source/PackageManagerResolver/src/PackageManagerResolver.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static PackageManagerResolver() {
9494

9595
RunOnMainThread.Run(() => {
9696
// Load log preferences.
97-
VerboseLoggingEnabled = VerboseLoggingEnabled;
97+
UpdateLoggerLevel(VerboseLoggingEnabled);
9898
}, runNow: false);
9999
}
100100

@@ -645,9 +645,13 @@ public static bool VerboseLoggingEnabled {
645645
get { return settings.GetBool(PreferenceVerboseLoggingEnabled, defaultValue: false); }
646646
set {
647647
settings.SetBool(PreferenceVerboseLoggingEnabled, value);
648-
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
648+
UpdateLoggerLevel(value);
649649
}
650650
}
651+
652+
private static void UpdateLoggerLevel(bool verboseLoggingEnabled) {
653+
logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info;
654+
}
651655

652656
/// <summary>
653657
/// Whether scoped registries are supported in current Unity editor.

source/VersionHandlerImpl/src/VersionHandlerImpl.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,7 @@ public static Logger Logger {
22902290
/// Load log preferences.
22912291
/// </summary>
22922292
private static void LoadLogPreferences() {
2293-
VerboseLoggingEnabled = VerboseLoggingEnabled;
2293+
UpdateLoggerLevel(VerboseLoggingEnabled);
22942294
}
22952295

22962296
/// <summary>
@@ -2512,9 +2512,13 @@ public static bool VerboseLoggingEnabled {
25122512
defaultValue: false); }
25132513
set {
25142514
settings.SetBool(PREFERENCE_VERBOSE_LOGGING_ENABLED, value);
2515-
logger.Level = value ? LogLevel.Verbose : LogLevel.Info;
2515+
UpdateLoggerLevel(value);
25162516
}
25172517
}
2518+
2519+
private static void UpdateLoggerLevel(bool verboseLoggingEnabled) {
2520+
logger.Level = verboseLoggingEnabled ? LogLevel.Verbose : LogLevel.Info;
2521+
}
25182522

25192523
/// <summary>
25202524
/// Enable / disable verbose logging.

0 commit comments

Comments
 (0)