From 945a6b760adc1d8a63284baa19b4c2c55e6bdcb1 Mon Sep 17 00:00:00 2001
From: joelnir <joel.oscarsson@hotmail.com>
Date: Sun, 3 Jan 2016 00:51:24 +0100
Subject: [PATCH] bugfixes

fixed bugs that displayed wrong notes and redid some of the socket
handling to deal with continous server connection losses
---
 __pycache__/config.cpython-35.pyc        | Bin 0 -> 910 bytes
 __pycache__/ls_connection.cpython-35.pyc | Bin 0 -> 2862 bytes
 __pycache__/note_reader.cpython-35.pyc   | Bin 0 -> 2421 bytes
 ls_connection.py                         |   6 ++--
 main_window.py                           |  40 ++++++++++++++---------
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 __pycache__/config.cpython-35.pyc
 create mode 100644 __pycache__/ls_connection.cpython-35.pyc
 create mode 100644 __pycache__/note_reader.cpython-35.pyc

diff --git a/__pycache__/config.cpython-35.pyc b/__pycache__/config.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..125b08fbd91ef96b6b04f888df2e11fdffd71b66
GIT binary patch
literal 910
zcmYjO&2G~`5S}!#+x)m`3k{_p;R2Uldf^5LNaJl{<e$iPD6Aq`Np?vs96PcdiTVk6
z1|FaiufYlN2zx@}#GO-5Oq@n#S3BD8n{U1u?Y0!9w$u9Z?y3Ut8~$4|-rwL!uP`tG
zim?Q=1Z)H72Cy>FGO!9T378CQ6WA88Dg?+QSp!xF)&Qme+XmJwcnJdZLGcby)T0th
zc7axb?E$+3>@Ki<2+$wPTfpuCI{<bc*dee7g#&s%1ojvLoCM7u0Y!fmD7H8P_xOoN
zt6@ADg%@#}1>f5MQyd=Guh&!=^EC74ahe9>kmvhTo-LU*kp(lZ)M#_ENc?mj2ALm3
zjDOCXs4H**QL%lih(@!O5mE_{R=Opr)P!`dYhLfq4{R>v9?`o!FZf$RAbGlH5L$DW
zO{_TMX@2Mg(~C^)gu&#Kn#HO;=aE{ZPG~jZX}m}#JQY&cA;ik7(}eTrWFAdL*&$lK
znQ&Gh+10JCLGoRfXQ~@S(~zsi=rUepLe}iT={lvw3w(ifs$$q}Ew35zh^=~xx@CLB
z^@-W{J_v~<Nt|3C72~LUHqS2AI8i5~NR8r59dk9rO3sb~`1$n(-E;<)g=1L98~Lg<
zY2XtaH-)5;(?OS3dbaD)O5b)oTJPAV@98G72M7$;M{Kq&%@x}kIcpCL&p+2K%|54%
zj&0bE?{<2`B%;2~nr>G#`nF+U$HGX|^^R@%XSSgcM@UQHiiSz7fp7OceTih^IJV<b
z#caR#&vb+Mu1<+iZU*<;264P^khE~@B3wV~JRc5Ho}|OKF%O4YJXy?^zdh^*S#L2O
x-u~op5=S3{>B;<3Y`vVtY!UKTW%Nm(Vvx&n2~P!MsZlv7<9)eHdpAr2(Leh^{eA!d

literal 0
HcmV?d00001

diff --git a/__pycache__/ls_connection.cpython-35.pyc b/__pycache__/ls_connection.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d122df607e4906d41197791439b5a408534502e9
GIT binary patch
literal 2862
zcmb7G&u`R56n_4(o7mZ8Q$SFts0=-ntstV}QlYA96-WU=Qn8_dRV3H3XE#o~b~-bg
zkX7gf4jiif3B7RYzvN?kY5#?u`n|E2-K4#AwKIP9%skJ0-}m10#l=PcUHJC<A3UNz
zXy#|b{u)jFiY_7Qp|>cpDYK{t1Am7yn}!bc9J1;$mwN7GUW0lKN^sktH(1}K1phf>
z&rvc@iDzsWJ|zpr_9$slvS@5PT%x3H>;+1eDfz(Im~f7g^TuA}4Rt#g#?sGJAVptD
z73d;(oF0nqL6+(u%>%tF0+H)fiXbWC(Gd2Ezgpynm>lV}$b+L)?*<vxsA`SE#9UyZ
zEJlM}<3I_C`9WL^4=}_Y{sJzv-m%K&=B^Y`5<C0=KNoEdZ52)3M5hgO+MstrbYjto
zO?`)6ll{t}6NmO}*uc=iS={jo_LhrSt6+dF<$)^VeWCeSe3I!lt1YdRO&!UB(4~uu
zTJJcLsVkSXJPzZ^6V6yR6sGBpTY8xaE0?7gM_Cs3M|oT}kJ3CTj(R?pgg7`3^czVZ
zp8meOdUyL7UZ%Dm6(ZZdS7WHQzfJXn(ayF3dcDv>ZNv5Sl`99wC1{yEVPA@|A^T%X
zws4L4X7aOO7{quU5Zfchq}#E^7oQ3}lDP_^pf82mtpQ==t8<ub&U6d#P%fl-s_TO;
z<AGvS$d*g!Pf^8#=EV_=<EsRQ@NTdLR=9Vl4|*)Jw(>jVYM1tXl26G3b=LSi=>{{%
z;|PK7)(Z#{e+>TQ(DU4)=M~*%0&CS7zw^CKnF=G+8m)gZov9Vyd)SBGj1*X;sS4C6
zj)hYFQC2Uw{+__=f$w1k-;1OYbj4^80XR9RW$)b>MhTQ%1Un*-5xnMrRf&U0M%pMI
z#CLpeZN1Yh=jykYO&I-jP`VE`x|^l@-Nw_+(!2jM76%+YW#d4mIiw|7^>Us&WD_ba
zafTGxz~c*Ois`30$GU2rvwZ84ZAN0&0RQ;<UJp!I#R>FaK<?P%3#(b70O4$etZ*<k
zVjh42ArEW%&+MXXnK|{~CvZQ}#)q&^ZNkBWRi5w>I*1bc0L!m!lIKn4;fPIKu-X_W
zzPGw7;(e%dmbD$BkHj>Hqdb|3U_+VGX_f_1tP$)1j~^9sKg|aaz(n{vMUjap_q}p)
zM<^X06iTH#nb-tPIH?kO66zw%RL80~;25e-ZDL_L=ABIf5tMz(XKJFOX4`UY$;XRL
zfWY8Gx6#bOe}-{<?Q~EeVY!^eE<@C;>#e*+mSw1U!HP#n>>(<M1{Mv_13D~e(rcGq
z*_`_jAeZGEI=*83q8OL}+CwF9*<p9<$G7ht!hD{an$krf>2{jq-+ix(6Hmwo&qIa{
znnn#6DL{8x7PEnb*g%x5MVS&e13igC2GGPzG18NCyCc|99RXNo+|O{rxft09)qq_U
zvT_=veQ+2EDe<I;<B{Y*u7ptq(aPg)xVrJ=$v5lwx<MbaqQfYSKql7~J_s*ZlPv%A
zPf#&#jCB9j7wa9bba|hpqqHoWB9DtiNKRhm!i-DgM3JF*lnZ!CxcTtO{f%b`St;Vf
zvY7~8gbKld%HeHZ*lSg3G~}dzd?r}r6->Q@rY@qRdB?hDIhKbM?&Ep|t!0}z@8gDL
z#1b;{xea4BZeCfOQ=uJ=oNAN0!P3Ajv(BZwE`h&Hwa+-CG>Ml%(KiLKj+DAo=hJYS
zA?McTOoUE{DB0jUFLZE>5^74INHFonS}GMDOzQn@<h<!SjXnb8-22QU!mbS>Lo+!v
zdqLc}=G3L1LU8b#$D(vOPD_V#p<P3a@|Q#?yk`Qkje0%n?-5{9oH%K|ZMQAomY>1?
zZ%D6U<P4+$P+n#jXEEHJo+pon;{U)`ogWD1#T23%cPQ4NGF5lEG)0Hs#7W73Q==d|
z*zs8emZk{s8hl;W05sZmlT#9ZICYlFxiG{>TNuhk-1ofd%LI{WK5~rwWq=X$Jz;9Q
zsU(s!xyfo~BL+?5ab_Ea5|bY1zZ@3HC=*}t*NNh#O{--sqqXc-v*othXsy<z*7840
C>c!{)

literal 0
HcmV?d00001

diff --git a/__pycache__/note_reader.cpython-35.pyc b/__pycache__/note_reader.cpython-35.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..97d978a49c50f5e0e71bc2f4097a6189511823aa
GIT binary patch
literal 2421
zcmZ`*O>Z1U5UrlsubJ%H#DNe?A!$Y8V<lt(7a|lQq9leO;z(>DVQ^SYc6yz$$1|Jm
z-Z);_TpS>rxWSbxzkmb(WUid@7jl7DJ-hbCgwak<S9e!+b=9lad%DvJ%Y~<3{}K@W
zO>>Wj{wH|NcW4s)1Z6~<f+BAw`m|Z2s5TSp6xAugtWQsfq6Q_Hs=I!Z5{OOLZ&89@
z;Q9fZ?RCRv*n`#vf<Jibc;OFS#cK}GShw>Y(SacA(WXyZHPUCD_U<XNHNqUWKJaK?
z(4D+ZLI^hfO)lu}2GPEAYu~5GAJCpp`g__Fv{@$@--j}cjcE^t8{Eex;^9p;4h3}X
zV5ZltO`e3omnu$-9HyC)v6UO?BbCchY#+!tPo!3MtaBs7AeLEbtQ-`%jnh2MH)Nb;
zQWrZ$7DH*(V=L2qs?Nq%*m9*jj5DKTI;=Js#JS81EAJ~<j}xq0Erq__ZI(6Owrp-F
zYto4-8`x`@Zj_yySMK&#Z+vmR-@6fAFKfj}<z<U?voy!Dc!YtZTQ39Nx6ekR5IZQ-
z=Ygm>?DIkswYQWS^;r?_N3FqFyNN$YpFl#MU%dL!`d3D2v;KLZvh{1lV7#qzYt}za
z?Pufr>%CEy+BLSj&eokFrB_C~<pNypyD_)X66g3V8Vb&cn&*pC!WV(x5DgKCw$~7^
zc%i2|m_LL^140e2kJtQ#2AM+g0Xiff=u2wc|C#6~q9I0r$_D-DK)_JIf+lDE@fM@z
z+Pwko*J-a#n=sVk<U@Q)Jc7QSICT8Zr~&w==%@@l{FpIQtz#3Ib~*;*02Q_k==Be=
z6BgcKjQ#nd6_^C}C%=Zl?RZNW`Crr+s}X&Jv|rB$MS?XI<fh{?9t;Z236i#u_JLxo
zC^;<jc5E$%=WxZd$3Z#M0HO;m)gz^MrQyV_0K<pj=Bi{i=yAB;L4&B7(A8d5b<2qP
zmPf_gt_mBpjEF<-b(?Fenzf&cZ=Y4)d(ZyC;~>-(WsMQwgsN#{ZP`jq-=;QG7kNL<
zH317XZ*oq#7&z>hl}lMMK&f0_nJs_0zo((jUJCYT^qT8?m3RJHDZ=NXGxbI@5|29*
z!g{WD*w4$DHXH{M6ZyZcOc%f44CC|^Yx9XfW$*{cVwdWq-*Z@V?6r(h$m}kDKK<a)
zat~4uBKT)bFG63RoHYobpQ*enoagxPS?2<|sMU7yNU{H}bgy7~8qW)2!JEAK@<SZc
zDv>>@UxjYhE9(rrk!Ei0HcH1E6<ugPpFV@845qbhY!onSuxO5gJM+`!x;^j0`_MKQ
z&``78X!}bIaDdnG7QHs|-w^@6ZLtJK=y>`ZRvpHe<I9P;ir2h_<}k+K15~9s?Z9fC
zfEeR4aE$Ivemg2X$Kt4>c*^c`d_JwqofJHOR5D=z3TM&X2Gv25|Eow{9985I*RQ_7
z^{J6+dt`T+<hvE+xpQ`X9pX^9?$Er!4KwguqJtTuntPZ)Y2s-zb=JJLr_Vzg@DM*-
zh5WiuaS*GU^#HW!a0v`Kz~SlyqxQP~WH$_M;mTlkatAdkQv)k^(mW}4=J=&L%Xn1q
zg*Cr4EpjZog-Ge06j$5qmW=P4A{&FQW|6NftHddD5Y~XWmb<2sG>#Tyv&FX=59IN-
zV*cR%@o1c=?6~VJ#|cdf%`6_8@zo8ZCA*d878ep*fc31{h{B`3mRJ@w3$wz`X&;j2
rKPB!Sa!GMvb=KzgcX_Eu?9z6Tj5BqagKc<dQ2@vb?epz-+b918JF7WO

literal 0
HcmV?d00001

diff --git a/ls_connection.py b/ls_connection.py
index 06a3b31..5c99d51 100644
--- a/ls_connection.py
+++ b/ls_connection.py
@@ -11,7 +11,7 @@ def ls_connect(ls_socket, call_func, window):
 	"""Connects given socket to the livesplit server."""
 	con_thread = Thread(target=try_connection, args=(ls_socket, call_func, window))
 	con_thread.start()
-		
+	
 		
 def init_socket():
 	"""Returns a fresh socket"""
@@ -31,9 +31,9 @@ def try_connection(ls_socket, call_func, window):
 		
 	call_func(window)
 	
-def close_socket(socket):
+def close_socket(com_socket):
 	"""Closes given socket."""
-	socket.close()
+	com_socket.close()
 
 def check_connection(ls_socket):
 	"""
diff --git a/main_window.py b/main_window.py
index dc46ab6..7d67804 100644
--- a/main_window.py
+++ b/main_window.py
@@ -38,7 +38,7 @@ def update(window, com_socket, text1, text2):
 	"""
 	if not runtime_info["ls_connected"]:
 		#try connecting to ls
-		connection_ok = con.ls_connect(com_socket, server_found, window)
+		con.ls_connect(com_socket, server_found, window)
 	else:
 		#is_connected
 		if runtime_info["notes"]:
@@ -49,7 +49,7 @@ def update(window, com_socket, text1, text2):
 			
 			if isinstance(new_index, bool):
 				#Connection error
-				test_connection(com_socket)
+				com_socket = test_connection(com_socket, window, text1, text2)
 			else:
 				#index retrieved succesfully
 				if new_index == -1:
@@ -61,7 +61,12 @@ def update(window, com_socket, text1, text2):
 						set_title_notes(window, 0)
 				else:
 					#timer is running
-					runtime_info["timer_running"] = True
+					if not runtime_info["timer_running"]:
+						runtime_info["timer_running"] = True
+						
+						#special case to fix scrolling
+						if runtime_info["active_split"] == 0:
+							runtime_info["active_split"] = -1
 					
 					if not runtime_info["active_split"] == new_index:
 						#new split, need to update
@@ -77,35 +82,38 @@ def update(window, com_socket, text1, text2):
 						else:
 							#connection error
 							set_title_notes(window, new_index)
-							test_connection(com_socket)
+							com_socket = test_connection(com_socket, window, text1, text2)
 							
 						runtime_info["active_split"] = new_index
 
 		else:
 			#notes not yet loaded
-			if not con.check_connection(com_socket):
-				#connection lost
-				runtime_info["ls_connected"] = False
-				update_icon(False, window)
-				com_socket = con.init_socket()
-			
+			com_socket = test_connection(com_socket, window, text1, text2)
+				
 	
 	
 	#self looping
 	window.after(int(config.POLLING_TIME * 1000), update, window, com_socket, text1, text2)					
 	
 	
-def test_connection(com_socket):
+def test_connection(com_socket, window, text1, text2):
 	if con.check_connection(com_socket):
-		return True
+		return com_socket
 	else:
-		reset_connection(com_socket)
-		return False
+		return reset_connection(com_socket, window, text1, text2)
 
 
-def reset_connection(com_socket):
+def reset_connection(com_socket, window, text1, text2):
+	if runtime_info["timer_running"]:
+		runtime_info["timer_running"] = False
+		runtime_info["active_split"] = -1
+		
+		update_notes(window, text1, text2, -1)
+		set_title_notes(window, 0)
+	
 	runtime_info["ls_connected"] = False
-	com_socket = con.init_socket()
+	update_icon(False, window)
+	return con.init_socket()
 	
 
 def server_found(window):