Merge remote-tracking branch 'upstream/main' into use-glibc-instead-o…

…f-proot
brunodev85 · Aug 3, 2024 · 92470ea · 92470ea
2 parents d80353d + c96084d
commit 92470ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
     <uses-feature
         android:name="com.oculus.feature.PASSTHROUGH"
         android:required="false" />
+    <uses-feature
+        android:name="oculus.software.handtracking"
+        android:required="false" />
     <uses-feature
         android:name="oculus.software.overlay_keyboard"
         android:required="false" />
@@ -56,6 +59,7 @@
             android:process=":vr_process"
             android:theme="@style/AppThemeFullscreen">
             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                 <category android:name="com.oculus.intent.category.VR" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>

diff --git a/app/src/main/java/com/winlator/container/Shortcut.java b/app/src/main/java/com/winlator/container/Shortcut.java
@@ -36,9 +36,10 @@ public Shortcut(Container container, File file) {
 
         int index;
         for (String line : FileUtils.readLines(file)) {
-            index = line.indexOf("[");
-            if (index != -1) {
-                section = line.substring(index+1, line.indexOf("]", index));
+            line = line.trim();
+            if (line.isEmpty() || line.startsWith("#")) continue; // Skip empty lines and comments
+            if (line.startsWith("[")) {
+                section = line.substring(1, line.indexOf("]"));
             }
             else {
                 index = line.indexOf("=");