From 097d48c2c4e0a4e5586c3f2735078ddd58c6c9da Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Thu, 23 Jul 2015 02:30:04 -0500
Subject: [PATCH] Revert "Corrected the http dialog"

This reverts commit 5a87c90058e60d98a29727c627e8d87f63b5b64e.
---
 resources/lib/PlayUtils.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/resources/lib/PlayUtils.py b/resources/lib/PlayUtils.py
index 6ef9da23..c87c1077 100644
--- a/resources/lib/PlayUtils.py
+++ b/resources/lib/PlayUtils.py
@@ -22,7 +22,6 @@ class PlayUtils():
     
     addonName = clientInfo.getAddonName()
     addon = xbmcaddon.Addon()
-    WINDOW = xbmcgui.Window(10000)
 
     audioPref = addon.getSetting('Audiopref')
     subsPref = addon.getSetting('Subspref')
@@ -37,7 +36,7 @@ class PlayUtils():
 
     def getPlayUrl(self, server, id, result):
 
-        WINDOW = self.WINDOW
+        WINDOW = xbmcgui.Window(10000)
         username = WINDOW.getProperty('currUser')
         server = WINDOW.getProperty('server%s' % username)
 
@@ -48,22 +47,18 @@ class PlayUtils():
                 self.logMsg("File is direct playing.", 1)
                 WINDOW.setProperty("%splaymethod" % playurl.encode('utf-8'), "DirectPlay")
 
-        elif self.isDirectStream(result) and WINDOW.getProperty('playurlFalse') != "true":
+        elif self.isDirectStream(result):
             # Try direct stream
             playurl = self.directStream(result, server, id)
             if playurl:
                 self.logMsg("File is direct streaming.", 1)
                 WINDOW.setProperty("%splaymethod" % playurl, "DirectStream")
 
-        elif self.isTranscoding(result) and WINDOW.getProperty('playurlFalse') != "true":
-            # Try transcoding
+        else:# Try transcoding
             playurl = self.transcoding(result, server, id)
             if playurl:
                 self.logMsg("File is transcoding.", 1)
                 WINDOW.setProperty("%splaymethod" % playurl, "Transcode")
-        else:
-            # Error or User cancelled HTTP dialog.
-            return False
 
         return playurl.encode('utf-8')
 
@@ -91,18 +86,16 @@ class PlayUtils():
             if self.fileExists(result):
                 return True
             else:
-                self.logMsg("Unable to direct play. Verify the following path is accessible by the device: %s. You might also need to add SMB credentials in the addon settings." % result[u'MediaSources'][0][u'Path'])
+                self.logMsg("Can't direct play: Unable to locate the content.", 1)
                 if dialog:
                     # Let user know that direct play failed
                     resp = xbmcgui.Dialog().select('Warning: Unable to direct play.', ['Play from HTTP', 'Play from HTTP and remember next time.'])
                     if resp == 1:
                         # Remember next time
                         self.addon.setSetting('playFromStream', "true")
-                    elif resp < 0:
+                    else:
                         # User decided not to proceed.
-                        self.logMsg("User cancelled HTTP selection dialog.", 1)
-                        self.WINDOW.setProperty("playurlFalse", "true")
-                        
+                        self.logMsg("Unable to direct play. Verify the following path is accessible by the device: %s. You might also need to add SMB credentials in the addon settings." % result[u'MediaSources'][0][u'Path'])
                 return False