From 4418853e54cef3652723b418e02c55ac5de8e7a9 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 18 Oct 2014 06:06:27 +0200
Subject: [PATCH] (OSX/platform.m) Cleanups

---
 apple/OSX/platform.m | 15 +++++++++------
 apple/OSX/settings.m |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index da59ea770a..ac4c26b300 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -52,16 +52,19 @@ void apple_rarch_exited(void)
       case NSKeyUp:
       {
          NSString* ch = (NSString*)event.characters;
-
-         if (!ch || ch.length == 0)
-            apple_input_keyboard_event(event_type == NSKeyDown, event.keyCode, 0, 0);
-         else
+         uint32_t character = 0;
+         uint32_t mod = 0;
+         
+         if (ch && ch.length != 0)
          {
-            apple_input_keyboard_event(event_type == NSKeyDown, event.keyCode, [ch characterAtIndex:0], event.modifierFlags);
-
+            character = [ch characterAtIndex:0];
+            mod       = event.modifierFlags;
+            
             for (NSUInteger i = 1; i < ch.length; i ++)
                apple_input_keyboard_event(event_type == NSKeyDown, 0, [ch characterAtIndex:i], event.modifierFlags);
          }
+         
+         apple_input_keyboard_event(event_type == NSKeyDown, event.keyCode, character, mod);
       }
          break;
       case NSFlagsChanged:
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index f8bce7fd3e..4fdc3bfde7 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -244,7 +244,7 @@ NSWindowDelegate>
    else
    {
        char buffer[PATH_MAX];
-       rarch_setting_t* setting_data, *setting = NULL;
+       rarch_setting_t *setting_data = NULL, *setting = NULL;
        setting_data = (rarch_setting_t*)driver.menu->list_settings;
        setting = (rarch_setting_t*)&setting_data[[item intValue]];