Skip to content

Commit

Permalink
Merge branch 'master' into build-system-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
srimanachanta authored Nov 22, 2023
2 parents 63d1f9b + 5d93515 commit 9855ae6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
9 changes: 1 addition & 8 deletions photon-client/src/components/app/photon-camera-stream.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 9855ae6

Please sign in to comment.