From bd36514ce71759444f5ecda7d446a2b195e269f1 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 17 Nov 2008 15:10:31 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : ba8
 Ricompilazione Demo : [ ] Commento            : 0000917: archiviazione ottica
 Entro nella ricerca file archiviati, mi chiede se voglio creare la cartella,
 se rispondo no mi viene comunque chiesto dove creare la cartella.

git-svn-id: svn://10.65.10.50/trunk@17659 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba8.cpp    |  3 ++-
 ba/ba8600.cpp | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ba/ba8.cpp b/ba/ba8.cpp
index 84d6cf1e0..39fa89036 100755
--- a/ba/ba8.cpp
+++ b/ba/ba8.cpp
@@ -6,12 +6,13 @@ int main(int argc, char** argv)
   const int n = argc > 1 ? (argv[1][1]-'0') : 0;
   switch (n)
   {
+  case  0: ba8100(argc, argv); break; // Record Selector
 	case  1: ba8200(argc, argv); break; // Query Generator
 	case  2: ba8300(argc, argv); break; // Report Generator
 	case  3: ba8400(argc, argv); break; // Form Converter
 	case  4: ba8500(argc, argv); break; // Report Printer
   case  5: ba8600(argc, argv); break; // Ricerca documenti archiviati
-  default: ba8100(argc, argv); break; // Record Selector
+  default: ba8300(argc, argv); break; // Report Generator
   }
   return 0;
 }
diff --git a/ba/ba8600.cpp b/ba/ba8600.cpp
index 60c9cd34a..163310806 100755
--- a/ba/ba8600.cpp
+++ b/ba/ba8600.cpp
@@ -196,19 +196,23 @@ bool TGoogle_app::create()
     msg << TR("Il server di archiviazione non e' configurato")
         << ":\n" << TR("si desidera usare la seguente cartella?")
         << '\n' << name;
-    ok = yesno_box(msg);
-    if (!ok)
+    const KEY ync = yesnocancel_box(msg);
+    if (ync != K_ESC)
     {
-      DIRECTORY dir; xvt_fsys_convert_str_to_dir(name, &dir);
-      ok = xvt_dm_post_dir_sel(&dir) == FL_OK;
+      ok = ync == K_YES;
+      if (!ok)
+      {
+        DIRECTORY dir; xvt_fsys_convert_str_to_dir(name, &dir);
+        ok = xvt_dm_post_dir_sel(&dir) == FL_OK;
+        if (ok)
+          xvt_fsys_convert_dir_to_str(&dir, name.get_buffer(), name.size());
+      }
       if (ok)
-        xvt_fsys_convert_dir_to_str(&dir, name.get_buffer(), name.size());
-    }
-    if (ok)
-    {
-      ok = xvt_fsys_mkdir(name) != 0;
-      if (ok)
-        ini.set("Data", name);
+      {
+        ok = xvt_fsys_mkdir(name) != 0;
+        if (ok)
+          ini.set("Data", name);
+      }
     }
   }