diff --git a/NAPS2/Config/ConfigManager.cs b/NAPS2/Config/ConfigManager.cs index 2fd3eae83e..229a07a91b 100644 --- a/NAPS2/Config/ConfigManager.cs +++ b/NAPS2/Config/ConfigManager.cs @@ -62,7 +62,7 @@ public virtual void Load() { config = null; TryLoadConfig(primaryConfigPath); - if (config == null) + if (config == null && secondaryConfigPath != null) { TryLoadConfig(secondaryConfigPath); } diff --git a/NAPS2/NAPS2.csproj b/NAPS2/NAPS2.csproj index eee804e8ee..165248ab0a 100644 --- a/NAPS2/NAPS2.csproj +++ b/NAPS2/NAPS2.csproj @@ -318,9 +318,6 @@ FEditScanSettings.cs - - FEditScanSettings.cs - FEditScanSettings.cs diff --git a/NAPS2/WinForms/FEditScanSettings.en.resx b/NAPS2/WinForms/FEditScanSettings.en.resx deleted file mode 100644 index e28ab8bafd..0000000000 --- a/NAPS2/WinForms/FEditScanSettings.en.resx +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - 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 - RK5CYII= - - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAFxcXPldXV6RYWFilV1dXpFZWVqRUVFSkVFRUpFRUVKRSUlKkUlJSpFRSVKRcVlymRkRGnQAA - AC8AAAAAAAAAAI2NjcHm5ub/3t7e/97e3v/d3d3/3d3d/9/f3//f39//3Nzc/93c3f/Y2tj/pNKk/8rY - yv9KSEqZAAAAAAAAAAChoaHN5+jo/+Hj5f/g4uT/6Orr//n6/P/+/////f////T29//l5un/097X/2vO - bv+63Lr/ZWBlpAAAAAAAAAAAsLCwzf36+P/l1s//49TM/+ja0v/s39j/697Z/+ve2P/r3tf/5tjQ/+PU - zP/t3t3//////2NjY6IAAAAAAAAAAKKjprLx18H/7MGL//XWpP/44rb/+enD//nt0f/568z/+ea7//bc - rf/00Zz/57uL//Hl4P9KTE6DAAAAAAAAAABnaW1z8NfD//LIj//74bX//uvH///xzf//8MT//+2+//3n - t//63qr/+NOZ/+q8i//a09D+ExYWQgAAAAAAAAAAMDQ0PuXXzv3uyJ3//ObF//zoyv/87ND//OvL//rg - sv/316H/9s+W//PEhf/txZ//s7K03gAAABAAAAAAAAAAAAAPDxHOysjl5byb//zkw//75sn/++fM//vp - z//758n/+N20//bTpP/uv4v/7s+2/4eKjLAAAAAAAAAAAAAAAAAAAAAAmpueqe7Lr//217P/++TI//vl - yf/75sr/++bK//vlyv/85cr/7cSe/+nVyv9RU1V/AAAAAAAAAAAAAAAAAAAAAFhbXV7s3tX/5MOq/+fN - t//nzrj/5865/+fOuP/nzbf/58y1/+XHsP/NysjtExMTMQAAAAAAAAAAAAAAAAAAAAAREREsu7y987Gx - s/+kpKX/paWm/6Wlpv+lpab/paWm/6SjpP/Lzc//cnJzvAAAAAEAAAAAAAAAAAAAAAAAAAAAV1dXfNDQ - 0P+JiYr/iYmK/4qKi/+Kiov/ioqL/4qKi/+Hh4j/pqam/7e3t/YEBAQ4AAAAAAAAAAAAAAAAAAAAELCw - sNm3t7f/mpqa/56env+enp7/np6e/56env+enp7/np6e/5qamv/S0tL/SUlJkwAAAAAAAAAAAAAAADo6 - Olb09PT/ra2t/6mpqf+oqKj/p6en/6enp/+np6f/p6en/6qqqv+lpaX/2dnZ/6qqqt8AAAAXAAAAAAAA - AABLS0tT8/Pz/O7u7vzn5+f69PT0//j4+P/39/f/+Pj4//r6+v/s7Oz95OTk+vj4+P+enp7JAAAADQAA - AAAAAAAAAAAAAZKSkiaNjY00c3NzMKampqHi4uLl2dnZ3tnZ2eDKysrbS0tLYUhISC1KSkozDQ0NEwAA - AAAAAAAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIADAADAAwAAwAMAAMADAADAAwAAgAMAAIAB - AACAAQAAgAMAAA== - - - \ No newline at end of file