Merge branch 'master' into build-system-cleanup

PhotonVision · Nov 22, 2023 · 9855ae6 · 9855ae6
2 parents 63d1f9b + 5d93515
commit 9855ae6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/photon-client/src/components/app/photon-camera-stream.vue b/photon-client/src/components/app/photon-camera-stream.vue
@@ -57,14 +57,7 @@ const handleFullscreenRequest = () => {
 
 <template>
   <div class="stream-container">
-    <img
-      :id="id"
-      crossorigin="anonymous"
-      :src="streamSrc"
-      :alt="streamDesc"
-      :style="streamStyle"
-      onclick="this.requestFullscreen()"
-    />
+    <img :id="id" crossorigin="anonymous" :src="streamSrc" :alt="streamDesc" :style="streamStyle" />
     <div class="stream-overlay" :style="overlayStyle">
       <pv-icon
         icon-name="mdi-camera-image"

diff --git a/photon-server/src/main/java/org/photonvision/server/RequestHandler.java b/photon-server/src/main/java/org/photonvision/server/RequestHandler.java
@@ -89,8 +89,9 @@ public static void onSettingsImportRequest(Context ctx) {
 
         if (ConfigManager.saveUploadedSettingsZip(tempFilePath.get())) {
             ctx.status(200);
-            ctx.result("Successfully saved the uploaded settings zip");
-            logger.info("Successfully saved the uploaded settings zip");
+            ctx.result("Successfully saved the uploaded settings zip, rebooting");
+            logger.info("Successfully saved the uploaded settings zip, rebooting");
+            restartProgram();
         } else {
             ctx.status(500);
             ctx.result("There was an error while saving the uploaded zip file");