From 89524187ba0b7ce0ac88e400b7d0296fa0d2992e Mon Sep 17 00:00:00 2001
From: "PC-SUMMO\\Michele Summo" <developer@artemide.org>
Date: Thu, 14 Apr 2022 18:02:19 +0200
Subject: [PATCH] Palette shift bugfix + pndefault at startup

---
 src/include/config.h     |  2 +-
 src/ui-hlp/menu.cpp      | 10 +++++++++-
 src/ui-hlp/ui_helper.cpp |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/include/config.h b/src/include/config.h
index cf153ec..b2717e7 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 // XaoS release
-#define XaoS_VERSION "4.2.1_MS_HACK"
+#define XaoS_VERSION "4.2.1_MS_HACK2"
 
 // URLs
 #define HELP_URL "https://github.com/xaos-project/XaoS/wiki"
diff --git a/src/ui-hlp/menu.cpp b/src/ui-hlp/menu.cpp
index ecd02e2..4050bc6 100644
--- a/src/ui-hlp/menu.cpp
+++ b/src/ui-hlp/menu.cpp
@@ -815,6 +815,7 @@ static void uih_palettecolors(struct uih_context *uih, dialogparam *p){
 static void uih_palettepicker(struct uih_context *uih, dialogparam *p)
 {
     uih_newimage(uih);
+    uih->manualpaletteshift = 0;
     uih->palettepickerenabled = 1;
 }
 
@@ -951,6 +952,12 @@ static void uih_newtonmodesffesw(struct uih_context *c)
     uih_setnewtonmodesffe(c, c->fcontext->newtonmodesffe ^ 1);
 }
 
+static void uih_newfractal(struct uih_context *c)
+{
+    uih_initstate(c);
+    uih_setpndefault(c, 1);
+}
+
 static int uih_cyclingselected(struct uih_context *c)
 {
     if (c == NULL)
@@ -1282,7 +1289,8 @@ void uih_registermenus_i18n(void)
                 UIH_TEXTCENTER, uih_xtextselected);
     MENUINTRB_I("xtextpos", NULL, "Right", "xtexteight", UI, uih_setxtextpos,
                 UIH_TEXTRIGHT, uih_xtextselected);
-    MENUNOP_I("file", NULL, TR("Menu", "New"), "initstate", 0, uih_initstate);
+    MENUNOP_I("file", NULL, TR("Menu", "Initstate"), "initstate", MENUFLAG_NOMENU, uih_initstate);
+    MENUNOP_I("file", NULL, TR("Menu", "New"), "newfractal", 0, uih_newfractal);
     MENUDIALOG_I("file", NULL, TR("Menu", "Open"), "loadpos",
                  MENUFLAG_INTERRUPT | MENUFLAG_NOPLAY, uih_loadfile,
                  loaddialog);
diff --git a/src/ui-hlp/ui_helper.cpp b/src/ui-hlp/ui_helper.cpp
index ccb9f8a..755b55a 100644
--- a/src/ui-hlp/ui_helper.cpp
+++ b/src/ui-hlp/ui_helper.cpp
@@ -2115,6 +2115,7 @@ uih_mkcontext(int flags, struct image *image,
     sffe_parse(&uih->fcontext->userformula, USER_FORMULA);
     sffe_parse(&uih->fcontext->userinitial, "");
 #endif
+    uih->fcontext->pndefault = 1;
     uih_setformula(uih, 0);
     uih_saveundo(uih);
     return (uih);