From 9b6b16e9991be42130718d4abd47734e6699a3d8 Mon Sep 17 00:00:00 2001
From: tippfehlr <jonigrot444@gmail.com>
Date: Sat, 28 May 2022 09:33:36 +0200
Subject: [PATCH] fix default values

---
 README.md    |  4 ++--
 midi2vjoy.py | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 3b4abce..1c33588 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Usage: midi2vjoy -m <midi_device> -c <config_file> [-v]
     -c  --config:       path to a config file (see example_config.conf)
     -v  --verbose:      verbose output
     
-Standard config file is mapping.conf in the same directory as midi2vjoy.exe.
-Standard MIDI device is 1.
+Default config file is mapping.conf in the same directory as midi2vjoy.exe.
+Default MIDI device is 1.
 ```
 ```
                __ _
diff --git a/midi2vjoy.py b/midi2vjoy.py
index bdbe9e4..814926e 100644
--- a/midi2vjoy.py
+++ b/midi2vjoy.py
@@ -223,8 +223,8 @@ def joystick_run():
 
     # Getting the MIDI device ready
     if options.midi == None:
-        print('You have to specify a MIDI interface to use')
-        return
+        options.midi = 1
+        print("No MIDI device specified, using {}.".format(options.midi))
     try:
         verbose('Opening MIDI device:', options.midi)
         midi = pygame.midi.Input(options.midi)
@@ -348,8 +348,8 @@ def help_page():
     -c  --config:       path to a config file (see example_config.conf)
     -v  --verbose:      verbose output
     
-Standard config file is mapping.conf in the same directory as midi2vjoy.exe.
-Standard MIDI device is 1.
+Default config file is mapping.conf in the same directory as midi2vjoy.exe.
+Default MIDI device is 1.
 ''')
 
 
@@ -406,10 +406,8 @@ def main():
                         action="store_true")
     parser.add_argument("-h", "--help", action="store_true")
     global options
-    options = parser.parse_args()
 
-    options.midi = 1
-    options.conf = "mapping.conf"
+    options = parser.parse_args()
 
     pygame.midi.init()
 
@@ -419,7 +417,10 @@ def main():
         help_config()
     elif options.test:
         midi_test()
-    elif path.exists(options.conf):
+    elif options.conf and path.exists(options.conf):
+        joystick_run()
+    elif path.exists(path.join(sys.path[0], "mapping.conf")):
+        options.conf = path.join(sys.path[0], "mapping.conf")
         joystick_run()
     else:
         help_page()