From 482a4990baa4f68ed30f196de9b98e68a0dc6a82 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Mon, 20 Jun 2022 06:38:52 +0200
Subject: [PATCH] Fix unhandled promise rejection, minor polishing

---
 res/ui/icons/savegame_correct.png             | Bin 0 -> 1973 bytes
 src/css/ingame_hud/standalone_advantages.scss |  21 +++++++++++++++++-
 .../game/hud/parts/standalone_advantages.js   |   4 +++-
 src/js/platform/browser/game_analytics.js     |   2 ++
 src/js/states/main_menu.js                    |   5 +++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 res/ui/icons/savegame_correct.png

diff --git a/res/ui/icons/savegame_correct.png b/res/ui/icons/savegame_correct.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcbce3dcd1d598010ab795666cf353f2d28c765c
GIT binary patch
literal 1973
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
Hu0mjf9G0&=

literal 0
HcmV?d00001

diff --git a/src/css/ingame_hud/standalone_advantages.scss b/src/css/ingame_hud/standalone_advantages.scss
index 0be61a5e..0f681242 100644
--- a/src/css/ingame_hud/standalone_advantages.scss
+++ b/src/css/ingame_hud/standalone_advantages.scss
@@ -89,14 +89,31 @@
             box-sizing: border-box;
             text-align: center;
             @include S(border-radius, $globalBorderRadius);
-            @include S(padding, 4px, 4px);
+            @include S(padding, 8px, 10px, 8px, 20px);
             @include S(margin-bottom, 15px);
             pointer-events: all;
             transition: background-color 0.12s ease-in-out;
             color: rgba(#000, 0.5);
 
+            width: 100%;
+            background: rgba($colorGreenBright, 0.2);
             cursor: pointer;
 
+            display: grid;
+            grid-template-columns: auto 1fr;
+            @include S(grid-gap, 5px);
+
+            &::before {
+                content: "";
+                display: inline-flex;
+                @include S(width, 15px);
+                @include S(height, 15px);
+                & {
+                    /* load-async */
+                    background: uiResource("icons/savegame_correct.png") center center / contain no-repeat;
+                }
+            }
+
             strong {
                 color: #000;
             }
@@ -145,6 +162,7 @@
         background: #eff2f4 #{D(12px)} center / #{D(30px)} no-repeat;
 
         @include S(border-radius, $globalBorderRadius);
+        align-items: center;
         @include S(padding, 10px, 4px, 4px);
         @include S(height, 40px);
 
@@ -160,6 +178,7 @@
             grid-column: 2 / 3;
             grid-row: 2 / 3;
             @include SuperSmallText;
+            line-height: 1em;
             opacity: 0.8;
         }
 
diff --git a/src/js/game/hud/parts/standalone_advantages.js b/src/js/game/hud/parts/standalone_advantages.js
index 2ce5c6ee..0229a712 100644
--- a/src/js/game/hud/parts/standalone_advantages.js
+++ b/src/js/game/hud/parts/standalone_advantages.js
@@ -35,7 +35,9 @@ export class HUDStandaloneAdvantages extends BaseHUDPart {
 
             <div class="lowerBar">
 
-            <div class="playtimeDisclaimerDownload">${T.demoBanners.playtimeDisclaimerDownload}</div>
+            <div class="playtimeDisclaimerDownload"><span class="inner">${
+                T.demoBanners.playtimeDisclaimerDownload
+            }</span></div>
 
             <button class="steamLinkButton steam_dlbtn_0">
             ${
diff --git a/src/js/platform/browser/game_analytics.js b/src/js/platform/browser/game_analytics.js
index eb252977..50398ba8 100644
--- a/src/js/platform/browser/game_analytics.js
+++ b/src/js/platform/browser/game_analytics.js
@@ -324,6 +324,8 @@ export class ShapezGameAnalytics extends GameAnalyticsInterface {
             version: G_BUILD_VERSION,
             level: root.hubGoals.level,
             gameDump: this.generateGameDump(root),
+        }).catch(err => {
+            console.warn("Request failed", err);
         });
     }
 
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index ff013bc0..741370e3 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -823,6 +823,11 @@ export class MainMenuState extends GameState {
         });
 
         const savegame = this.app.savegameMgr.getSavegameById(latestInternalId);
+        if (!savegame) {
+            console.warn("No savegame to continue found:", this.app.savegameMgr.currentData.savegames);
+            return;
+        }
+
         savegame
             .readAsync()
             .then(() => this.app.adProvider.showVideoAd())