From: Ed Page <eopage@byu.net>
Date: Wed, 19 May 2010 03:17:55 +0000 (-0500)
Subject: Fixing a bug related to browsing while paused
X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=commitdiff_plain;h=cb748fe6c17f9f6ebb4fc25dfa88626a6307714c;ds=sidebyside

Fixing a bug related to browsing while paused
---

diff --git a/src/stream.py b/src/stream.py
index 63afede..e9e3fb1 100644
--- a/src/stream.py
+++ b/src/stream.py
@@ -68,7 +68,7 @@ class GSTStream(gobject.GObject):
 	def set_file(self, uri):
 		if self._uri != file:
 			self._invalidate_cache()
-		if self.playing:
+		if self.state != self.STATE_STOP:
 			self.stop()
 
 		self._uri = uri
diff --git a/src/windows/_base.py b/src/windows/_base.py
index cc1134a..96ed2ec 100644
--- a/src/windows/_base.py
+++ b/src/windows/_base.py
@@ -425,9 +425,9 @@ class PresenterWindow(BasicWindow):
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_player_title_change(self, player, node):
 		if not self._active or node in [None, self._node]:
-			self._playerNode = player.node
+			self._playerNode = node
 			return
-		self._playerNode = player.node
+		self._playerNode = node
 		self.emit("jump-to", node)
 		self._window.destroy()