diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
index 25d437a..9a275da 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
@@ -43,6 +43,7 @@
 
     //ボタン系
     private boolean buttonView = true;
+    private boolean player = true;
     private Button buttonPlayback;
     private Button buttonReset;
     private Button buttonClose;
@@ -82,12 +83,7 @@
         buttonPlayback = findViewById(R.id.button_playback);
         buttonPlayback.setOnClickListener(new View.OnClickListener(){
             public void onClick(View v) {
-                if(onClickPlayback()){
-                    buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_play_arrow));
-                }
-                else {
-                    buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_pause));
-                }
+                onClickPlayback();
             }
         });
 
@@ -128,6 +124,7 @@
         buttonDetail = findViewById(R.id.button_detail);
         buttonDetail.setOnClickListener(new View.OnClickListener(){
             public void onClick(View v) {
+                if(player) onClickPlayback();
                 Intent intent = new Intent(AnimationActivity.this, AnimationDetailActivity.class);
                 intent.putExtra("AnimationJsonData", animationJson);
                 startActivity(intent);
@@ -220,19 +217,21 @@
     }
 
     //アニメーションの再生停止
-    public boolean onClickPlayback(){
+    public void onClickPlayback(){
         if(timer != null){
             //timerの終了
             timer.cancel();
             timer = null;
-            return true;
+            buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_play_arrow));
+            player = false;
         }
         else{
             //timerの生成
             this.timer = new Timer();
             this.timerTask = new CountUpTimerTask();
             this.timer.schedule(timerTask,0, this.msec);//スケジュールを100ms毎に設定する。
-            return false;
+            buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_pause));
+            player = true;
         }
     }