From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 2 Dec 2021 18:57:29 +0000 (+0000)
Subject: wait #4936 @3
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=67068197f8edaecb7cf69d3e970fba3215fc5928;p=cubeextranet.git

wait #4936 @3
---

diff --git a/fluidbook/compile/html-silent.nsi b/fluidbook/compile/html-silent.nsi
index 6f3810fb0..876bbb7e1 100644
--- a/fluidbook/compile/html-silent.nsi
+++ b/fluidbook/compile/html-silent.nsi
@@ -51,8 +51,8 @@ Section "" ;No components page, name is not important
     File /a  /r "$fdir\*"
 
     ; Create shortcut
-    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"
-    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"
+    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"
+    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"
 
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayName" "${FLUIDBOOKNAME}"
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\package.nw\icon.ico$\""
@@ -63,7 +63,7 @@ Section "" ;No components page, name is not important
 
     WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-    ExecShell "" "$INSTDIR\$fname.exe"
+    ExecShell "" "$INSTDIR\$fname.exe" "--disable-crash-handler=true"
 SectionEnd
 
 Section "Uninstall"
diff --git a/fluidbook/compile/html.nsi b/fluidbook/compile/html.nsi
index 38c4bedaf..1656b40d7 100644
--- a/fluidbook/compile/html.nsi
+++ b/fluidbook/compile/html.nsi
@@ -47,8 +47,8 @@ Section "" ;No components page, name is not important
     File /a  /r "$fdir\*"
 
     ; Create shortcut
-    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"
-    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"
+    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"
+    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"
 
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayName" "${FLUIDBOOKNAME}"
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\package.nw\icon.ico$\""
@@ -59,7 +59,7 @@ Section "" ;No components page, name is not important
 
     WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-    ExecShell "" "$INSTDIR\$fname.exe"
+    ExecShell "" "$INSTDIR\$fname.exe" "--disable-crash-handler=true"
 SectionEnd
 
 Section "Uninstall"
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 460aaeab6..8a2740488 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -737,8 +737,8 @@ class wsBookParametres extends wsParametres
         // .
         $this->fields['offlineLink'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du Fluidbook"), 'hint' => __('URL du fluidbook utilisée pour la version Offline (CD-ROM, clé USB, Exécutables)'));
         $this->fields['offlineTitle'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'application"));
-        $this->fields['offlineWindowsInstallPath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin d\'installation par défaut'), 'hint' => __('Par défaut') . ': %APPDATA%/Titre-de-l-application'];
-        $this->fields['offlineWindowsProfilePath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Répertoire de stockage du profile'), 'hint' => __('Par défaut') . ': %APPDATA%/Titre-de-l-application'];
+        $this->fields['offlineWindowsInstallPath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin d\'installation par défaut'), 'hint' => __('Par défaut') . ': %LOCALAPPDATA%/%title%'];
+        $this->fields['offlineWindowsProfilePath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Répertoire de stockage du profile'), 'hint' => __('Par défaut') . ': %LOCALAPPDATA%/%title%'];
         $this->fields['offlineEnableAdvancedPrinting'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le menu d\'impression avancée')];
         $this->forms['offline'] = array('label' => __('Version offline'),
             'fieldsnames' => array('offlineTitle', 'offlineLink', '|', 'offlineWindowsInstallPath', 'offlineWindowsProfilePath', '|', 'offlineEnableAdvancedPrinting'));
diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index fb46ab8fe..924e46fe5 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -82,6 +82,12 @@ class wsPackagerWinEXEHTML extends wsPackager
                 'fs' => '0.0.1-security',
                 'path' => '^0.12.7'],
         ];
+
+        if ($this->book->parametres->offlineWindowsProfilePath != '') {
+            $datadir = str_replace('%title%', $this->exeName, $this->book->parametres->offlineWindowsProfilePath);
+            $data['chromium-args'] = '--crash-dumps-dir=\'' . $datadir . '\' --user-data-dir=\'' . $datadir . '\'';
+        }
+
         $pngIcon = $this->vdir . '/icon.png';
         $winIcon = $this->vdir . '/icon.ico';