Merge pull request dnSpy#1531 from HoLLy-HaCKeR/fix-compiler-warning

Fix nullability warning
lgirouard · Jul 17, 2020 · 7241a9f · 7241a9f
2 parents e1b96bd + 1e85702
commit 7241a9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dnSpy/dnSpy/MainApp/App.xaml.cs b/dnSpy/dnSpy/MainApp/App.xaml.cs
@@ -325,7 +325,7 @@ Assembly[] GetAssemblies() {
 		Assembly[] LoadExtensionAssemblies() {
 			var dir = AppDirectories.BinDirectory;
 			var unsortedFiles = GetExtensionFiles(dir);
-			if (!(args.ExtraExtensionDirectory is null))
+			if (!string.IsNullOrEmpty(args.ExtraExtensionDirectory))
 				unsortedFiles = unsortedFiles.Concat(GetExtensionFiles(args.ExtraExtensionDirectory));
 
 			// Load the modules in a predictable order or multicore-JIT could stop recording. See

diff --git a/dnSpy/dnSpy/MainApp/AppCommandLineArgs.cs b/dnSpy/dnSpy/MainApp/AppCommandLineArgs.cs
@@ -77,6 +77,7 @@ public AppCommandLineArgs(string[] args) {
 			ShowStartupTime = false;
 			DebugAttachPid = 0;
 			DebugAttachProcess = string.Empty;
+			ExtraExtensionDirectory = string.Empty;
 
 			bool canParseCommands = true;
 			for (int i = 0; i < args.Length; i++) {