X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fosdn%2Fgokigen%2Fa01d%2Fcamera%2Fcanon%2Fwrapper%2Fconnection%2FCanonConnection.java;h=87ca24941776eea9bb8043f8c2d5786fbb0f51e2;hb=45b884c2118848d12f072f31d3b3b3d980e81083;hp=ccbe80d38690485757f9e076a0cac1abb9bfab81;hpb=0d8ad0678d3fe48fe309b272a1107a8b55abe00e;p=gokigen%2FA01d.git

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
index ccbe80d..87ca249 100644
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/canon/wrapper/connection/CanonConnection.java
@@ -234,13 +234,14 @@ public class CanonConnection implements ICameraConnection
         connectionStatus = CameraConnectionStatus.CONNECTING;
         try
         {
-            if (getConnectSequenceType() == 0)
+            if (getConnectSequenceType() == 1)
             {
-                cameraExecutor.execute(new CanonCameraConnectSequence(context, statusReceiver, this, interfaceProvider, statusChecker));
+                // 接続シーケンスが TYPE1 の時だけ有効とする (Power Shot Zoom用の接続シーケンス)
+                cameraExecutor.execute(new CanonCameraConnectSequenceType1(context, statusReceiver, this, interfaceProvider, statusChecker));
             }
             else
             {
-                cameraExecutor.execute(new CanonCameraConnectSequenceType1(context, statusReceiver, this, interfaceProvider, statusChecker));
+                cameraExecutor.execute(new CanonCameraConnectSequence(context, statusReceiver, this, interfaceProvider, statusChecker));
             }
         }
         catch (Exception e)