From da49bf46f048b7350e4d1110a99b888217764141 Mon Sep 17 00:00:00 2001
From: mtollari <mtollari@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 27 Mar 2017 15:41:54 +0000
Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:=2012.?=
 =?UTF-8?q?0=20Files=20correlati=20=20=20=20=20:=20xvaga.dll=20Commento=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20:=20-=20Sistemata=20funzione?=
 =?UTF-8?q?=20xvt=5Ffsys=5Fget=5Fdir,=20adesso=20non=20richiama=20pi=C3=B9?=
 =?UTF-8?q?=20ogni=20volta=20wxGetCwd=20ma=20utilizza=20la=20variabile=20g?=
 =?UTF-8?q?lobale=20=5Fstartup=5Fdir.=20-=20Aggiunta=20funzione=20xvt=5Ffs?=
 =?UTF-8?q?ys=5Fget=5Fdefault=5Fdir=5Fname=20che=20restituisce=20la=20vari?=
 =?UTF-8?q?abile=20=5Fstartup=5Fdir.=20-=20Sistemata=20xvt=5Fprint=5Fstart?=
 =?UTF-8?q?=5Fthread=20adesso=20non=20chiama=20pi=C3=B9=20wxGetCwd=20ma=20?=
 =?UTF-8?q?la=20nuova=20funzione=20xvt=5Ffsys=5Fget=5Fdefault=5Fdir=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.65.10.50/branches/R_10_00@23705 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 src/xvaga/xvaga.cpp    | 11 ++++++++++-
 src/xvaga/xvtextra.cpp |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/xvaga/xvaga.cpp b/src/xvaga/xvaga.cpp
index 53883771b..11ba051b1 100755
--- a/src/xvaga/xvaga.cpp
+++ b/src/xvaga/xvaga.cpp
@@ -1539,6 +1539,13 @@ BOOLEAN xvt_fsys_convert_str_to_fspec(const char *mbs, FILE_SPEC *fs)
   return ok;
 }
 
+wxString xvt_fsys_get_default_dir_name()
+{
+	if (_startup_dir.IsEmpty())
+    _startup_dir = ::wxGetCwd();
+  return _startup_dir;
+}
+
 void xvt_fsys_get_default_dir(DIRECTORY *dirp)
 {
   if (_startup_dir.IsEmpty())
@@ -1548,7 +1555,9 @@ void xvt_fsys_get_default_dir(DIRECTORY *dirp)
 
 BOOLEAN xvt_fsys_get_dir(DIRECTORY *dirp)
 {
-  return xvt_fsys_convert_str_to_dir(::wxGetCwd(), dirp);
+	if (_startup_dir.IsEmpty())
+    _startup_dir = ::wxGetCwd();
+  return xvt_fsys_convert_str_to_dir(_startup_dir, dirp);
 }
 
 void xvt_fsys_get_temp_dir(DIRECTORY *dirp)
diff --git a/src/xvaga/xvtextra.cpp b/src/xvaga/xvtextra.cpp
index ab9751271..bdbba532d 100755
--- a/src/xvaga/xvtextra.cpp
+++ b/src/xvaga/xvtextra.cpp
@@ -21,6 +21,8 @@
 #include "xvtpdf.h"
 #include "xvtwin.h"
 
+extern wxString xvt_fsys_get_default_dir_name();
+
 #pragma pack(4)
 
 struct TPRINT_RCD : public PRINT_RCD
@@ -870,7 +872,7 @@ void DestroyAbortWindow()
 
 BOOLEAN xvt_print_start_thread(BOOLEAN(*print_fcn)(long), long data)
 {
-  const wxString strDir = ::wxGetCwd(); // Memorizzo la directory corrente (Acrobat la cambia)
+  const wxString strDir = xvt_fsys_get_default_dir_name(); // Memorizzo la directory corrente (Acrobat la cambia)
 
   wxBeginBusyCursor();
   m_PrintoutCache.Reset(); // Forza nuovo contesto di stampa