Merge pull request #4975 from fr500/master

bump

CHANGES.md

@@ -1,4 +1,4 @@
-# 1.5.1 (future)
+# 1.5.0+ (future)
 - AUTOSAVE/SRAM - Fix bug #3829 / #4820 (https://github.com/libretro/RetroArch/issues/3829)
 - ENDIANNESS: Fixed database scanning. Should fix scanning on PS3/WiiU/Wii, etc.
 - NET: Fix bug #4703 (https://github.com/libretro/RetroArch/issues/4703)
@@ -9,8 +9,7 @@
 - LOCALIZATION: Update/finish French translation
 - LOCALIZATION: Update German translation
 - LOCALIZATION: Update Japanese translation
-- LOCALIZATION/GUI: Korean font should display properly now with XMB/MaterialUI's
-default font
+- LOCALIZATION/GUI: Korean font should display properly now with XMB/MaterialUI's default font
 - MENU: Improved rendering for XMB ribbon; using additive blending (Vulkan/GL)
 - OSX/MACOS: Fixes serious memory leak
 - WINDOWS: Added WASAPI audio driver for low-latency audio. Both shared and exclusive mode.
@@ -25,6 +24,7 @@ default font
 - LOBBIES: Fallback to filename based matching if no CRC matches are found (for people making playlists by hand)
 - LOBBIES: GUI refinement, show stop hosting when a host has been started, show disconnect when playing as client
 - LOBBIES: if the game is already loaded it will try to connect directly instead of re-loading content (non-fullpath cores only)
+- LOBBIES: unify both netplay menus
 - THUMBNAILS: Thumbnails show up now in Load Content -> Collection, Information -> Database 
 - VITA: Fix slow I/O
 - VITA: Fix 30fps menu (poke into input now instead of reading the entire input buffer which apparently is slow)

pkg/android/phoenix/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.retroarch"
     android:versionCode="53"
-    android:versionName="1.5.0"
+    android:versionName="1.6.0"
     android:installLocation="internalOnly">
     <uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>

pkg/apple/OSX/Info.plist

@@ -30,11 +30,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHighResolutionCapable</key>

pkg/apple/RetroArch_iOS9-Info.plist

@@ -33,11 +33,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>

pkg/apple/iOS/Info.plist

@@ -33,11 +33,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

pkg/wii/meta.xml

@@ -2,7 +2,7 @@
 <app version="1">
   <name>RetroArch</name>
   <coder>Libretro</coder>
-  <version>1.5.0</version>
+  <version>1.6.0</version>
   <release_date>2012-2017</release_date>
   <short_description>The cross-platform entertainment system</short_description> 
   <long_description>A port of RetroArch to the GameCube/Wii.</long_description> 

tasks/task_netplay_find_content.c

@@ -108,6 +108,7 @@ static void netplay_crc_scan_callback(void *task_data,
    {
       RARCH_LOG("[lobby] loading core %s with current content\n", state->core_path);
       command_event(CMD_EVENT_NETPLAY_INIT_DIRECT, state->hostname);
+      command_event(CMD_EVENT_RESUME, NULL);
    }
    /* no match found */
    else