-

mpvInputEdit/App.xaml.cs

@@ -7,7 +7,25 @@ namespace mpvInputEdit
 {
     public partial class App : Application
     {
-        public static string InputConfPath { get; } = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
+        public static string InputConfPath { get; } = MpvConfFolder + "input.conf";
+
+        static string StartupFolder { get; } = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\";
+
+        static string _MpvConfFolder;
+
+        public static string MpvConfFolder {
+            get {
+                if (_MpvConfFolder == null)
+                {
+                    if (Directory.Exists(StartupFolder + "portable_config"))
+                        _MpvConfFolder = StartupFolder + "portable_config\\";
+                    else
+                        _MpvConfFolder = Environment.GetFolderPath(
+                            Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
+                }
+                return _MpvConfFolder;
+            }
+        }
 
         private static ObservableCollection<InputItem> _InputItems;
 

mpvInputEdit/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv(.net) input edit")]
-[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 Frank Skare (stax76)")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]