From 8cb6284268947aa6b9a86db193e6e2aaad2d917e Mon Sep 17 00:00:00 2001
From: spx <spx268@gmail.com>
Date: Wed, 11 Feb 2015 07:50:13 +0900
Subject: [PATCH] =?utf8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E3=83=84?=
 =?utf8?q?=E3=82=A4=E3=83=BC=E3=83=88=E3=82=92=E4=BA=8C=E9=87=8D=E5=8F=96?=
 =?utf8?q?=E5=BE=97=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?=
 =?utf8?q?=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=20(thx=20@hama=5Fkai!)=20https://twitter.com/hama=5Fkai/status/?=
 =?utf8?q?565211579814141953?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/AppendSettingDialog.cs  | 17 +++++++++++++++++
 OpenTween/Resources/ChangeLog.txt |  1 +
 OpenTween/Tween.cs                |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index f209c2b0..43743421 100644
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -457,5 +457,22 @@ namespace OpenTween
         public bool PublicSearch;
         public bool Lists;
         public bool UserTimeline;
+
+        public static IntervalChangedEventArgs ResetAll
+        {
+            get
+            {
+                return new IntervalChangedEventArgs()
+                {
+                    UserStream = true,
+                    Timeline = true,
+                    Reply = true,
+                    DirectMessage = true,
+                    PublicSearch = true,
+                    Lists = true,
+                    UserTimeline = true,
+                };
+            }
+        }
     }
 }
diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index cb48fe6e..3a7de9dc 100644
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -31,6 +31,7 @@
  * FIX: プロフィール編集中にプロフィール画面を閉じるとエラーが発生する不具合を修正
  * FIX: 高DPI環境でサムネイル表示部の縦スクロールバーが正しくスケーリングされない問題を修正
  * FIX: pic.twitter.com への画像投稿が失敗してもエラー表示されなかった不具合を修正
+ * FIX: UserStreams を無効にした状態で起動すると、起動時のツイート取得が二重に行われることがある不具合を修正 (thx @hama_kai!)
 
 ==== Ver 1.2.4(2014/11/23)
  * NEW: Mobypicture (mobypicture.com) への画像投稿に対応
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 4b59ef47..5bd7b8c0 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1255,7 +1255,7 @@ namespace OpenTween
             ResetTimers = e;
         }
 
-        private IntervalChangedEventArgs ResetTimers = new IntervalChangedEventArgs();
+        private IntervalChangedEventArgs ResetTimers = IntervalChangedEventArgs.ResetAll;
 
         private static int homeCounter = 0;
         private static int mentionCounter = 0;
-- 
2.11.0