From 5208766085455f22d233fc14c948a1522e5d805e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Weber?= <mail@soeren-weber.de>
Date: Sun, 8 Dec 2024 01:01:49 +0100
Subject: [PATCH] variantgenerator: avoid accidently overwriting of existing
 changes #757

---
 layouts/partials/version.txt |  2 +-
 static/js/variant.js         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 15b19ebdfa..899005027d 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.1.1+544df5e41202b9b8bc59910fb2217ae9a2a9a4e4
\ No newline at end of file
+7.1.1+d159c08b16e0c832bf9c69f4f1abd462795ce747
\ No newline at end of file
diff --git a/static/js/variant.js b/static/js/variant.js
index 6ad65fcfef..29a072ca02 100644
--- a/static/js/variant.js
+++ b/static/js/variant.js
@@ -226,7 +226,15 @@ var variants = {
   // ------------------------------------------------------------------------
 
   changeColor: function (c) {
-    var customvariantbase = window.localStorage.getItem(window.relearn.absBaseUri + '/customvariant') ?? window.localStorage.getItem(window.relearn.absBaseUri + '/variant');
+    var variant = window.localStorage.getItem(window.relearn.absBaseUri + '/variant');
+    var customvariantbase = window.localStorage.getItem(window.relearn.absBaseUri + '/customvariant');
+
+    if (customvariantbase && customvariantbase != variant) {
+      alert('You already have changes based on the "' + customvariantbase + '" variant. Please proceed editing the custom variant, reset your changes or ignore this message.');
+      return;
+    }
+    customvariantbase = customvariantbase ?? variant;
+
     var base_style = this.findLoadedStylesheet('R-format-style', [':root:not([data-r-output-format="print"])[data-r-theme-variant="' + customvariantbase + '"]']);
     if (!base_style) {
       alert('An auto mode variant can not be changed. Please select its light/dark variant directly to make changes');