Skip to content

Commit c7ad7d8

Browse files
fix: prevent crash opening screenshots with no recent
1 parent b4fddc6 commit c7ad7d8

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/client/java/dev/spiritstudios/snapper/Snapper.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ public void onInitializeClient() {
6161
client.player.sendMessage(Text.translatable("text.snapper.panorama_success", SCREENSHOT_MENU_KEY.getBoundKeyLocalizedText()), true);
6262
}
6363
while (RECENT_SCREENSHOT_KEY.wasPressed()) {
64-
File latestScreenshot = ScreenshotActions.getScreenshots(client).getFirst();
64+
List<File> screenshots = ScreenshotActions.getScreenshots(client);
65+
if (screenshots.size() == 0) {
66+
if (client.player != null) client.player.sendMessage(Text.translatable("text.snapper.screenshot_failure_open"), true);
67+
continue;
68+
}
69+
File latestScreenshot = screenshots.getFirst();
6570

6671
client.setScreen(new ScreenshotViewerScreen(
6772
ScreenshotImage.of(latestScreenshot, client.getTextureManager()),

src/client/resources/assets/snapper/lang/en_us.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"text.snapper.rename_invalid": "New name for screenshot invalid",
2828
"text.snapper.rename_invalid_png": "Name must end with '.png'",
2929
"text.snapper.screenshot_instructions": "%s. View by pressing %s",
30+
"text.snapper.screenshot_failure_open": "Take a screenshot in order to view it",
3031
"panorama.snapper.failure": "Couldn't save panorama: %s",
3132
"panorama.snapper.success": "Saved screenshot as %s"
3233
}

0 commit comments

Comments
 (0)