From 95637f985f12a3d1bfc9ff46e3938b738c0535e4 Mon Sep 17 00:00:00 2001
From: Fabien Bodard <gambas.fr@gmail.com>
Date: Mon, 22 Dec 2014 21:57:04 +0000
Subject: [PATCH] [GB.SCANNER] * BUG: Do not set type on model.

git-svn-id: svn://localhost/gambas/trunk@6768 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 comp/src/gb.scanner/.settings           |  8 ++++----
 comp/src/gb.scanner/.src/Module2.module | 10 ++++------
 comp/src/gb.scanner/.src/Scanner.class  |  3 ++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/comp/src/gb.scanner/.settings b/comp/src/gb.scanner/.settings
index 3685b1100..ff720028b 100644
--- a/comp/src/gb.scanner/.settings
+++ b/comp/src/gb.scanner/.settings
@@ -20,18 +20,18 @@ Geometry=[-7,-10,210,210]
 Geometry=[-7,-10,210,210]
 
 [FCommit]
-LastCommit="[GB.SCANNER]\n* BUG: Test if the scanner exist just on an option call.\n---- Cette ligne et les suivantes seront ignorées ----\n\nM       .project\nM       .src/Module2.module\nM       .src/Scanner.class\nM       .src/Scanners.class\nM       .startup"
+LastCommit="[GB.SCANNER]\n* BUG: Test if the scanner exist just on an option call.\n\n---- Cette ligne et les suivantes seront ignorées ----\n\nM       .project\nM       .settings\nM       .src/Module2.module\nM       .src/Scanner.class\nM       .src/Scanners.class\nM       .startup"
 
 [OpenFile]
-File[1]=".src/Scanner.class:192.16"
-File[2]=".src/Scanners.class:89.3"
+File[1]=".src/Scanner.class:289.3"
+File[2]=".src/Scanners.class:89.2"
 File[3]=".src/_Option.class:66.55"
 Active=1
 File[4]=".src/MTest.module:5.0"
 Count=7
 File[5]=".src/Module1.module:2.0"
 File[6]=".src/MTest2.module:14.6"
-File[7]=".src/Module2.module:4.2"
+File[7]=".src/Module2.module:12.0"
 File[8]=".src/Demo/FProperties.class:0.0"
 File[9]=".src/Demo/FMain.class:5.2"
 
diff --git a/comp/src/gb.scanner/.src/Module2.module b/comp/src/gb.scanner/.src/Module2.module
index d1158b7a6..8d25e0001 100644
--- a/comp/src/gb.scanner/.src/Module2.module
+++ b/comp/src/gb.scanner/.src/Module2.module
@@ -2,11 +2,9 @@
 
 Public Sub Main()
 
-  Dim s As String
-  
-  For Each s In Scanners
-    Print s
-    Print Scanners[s].IsAvailable()
-  Next
+ Dim s As String
+ For Each s In Scanners
+   Print Scanners[s].model
+ Next
   
 End
diff --git a/comp/src/gb.scanner/.src/Scanner.class b/comp/src/gb.scanner/.src/Scanner.class
index a2a638ba2..4a84e100b 100644
--- a/comp/src/gb.scanner/.src/Scanner.class
+++ b/comp/src/gb.scanner/.src/Scanner.class
@@ -52,7 +52,7 @@ Private Sub GetInfo()
   
   hInfo = Scanners._GetInfo($sName)
   $sVendor = hInfo.Vendor
-  $sModel = hInfo.Type
+  $sModel = hInfo.Model
   $sType = hInfo.Type
   bHaveInfo = True
   
@@ -292,6 +292,7 @@ End
 Public Sub Process_Kill()
   
   $sImageStack.Push($sCurImagePath)
+  $fProgress = 1
   Raise Finished
   
 End