From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 26 Sep 2018 13:56:04 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5c6ee41a003927f683aa72ac55c1eb0978257411;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31293
---

diff --git a/client/DxPlay/Configuration/dxplay.json1 b/client/DxPlay/Configuration/dxplay.json
similarity index 100%
rename from client/DxPlay/Configuration/dxplay.json1
rename to client/DxPlay/Configuration/dxplay.json
diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj
index ada4f36e..491bf692 100644
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -243,7 +243,7 @@
     <None Include="Configuration\dxplay.en">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Configuration\dxplay.json1">
+    <None Include="Configuration\dxplay.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="packages.config">
diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index 2fb0a3b0..1ce72ed2 100644
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -288,8 +288,10 @@ namespace DxPlay {
                 playerHeight = (int)Math.Ceiling(rc.Right * x); ;
             }
 
-            hr = graph.VideoWindow.SetWindowPosition((rc.Right - playerWidth) / 2, (rc.Bottom - playerHeight) / 2, playerWidth, playerHeight);
-            DsError.ThrowExceptionForHR(hr);
+            if (graph != null) {
+                hr = graph.VideoWindow.SetWindowPosition((rc.Right - playerWidth) / 2, (rc.Bottom - playerHeight) / 2, playerWidth, playerHeight);
+                DsError.ThrowExceptionForHR(hr);
+            }
         }
 
         public void ToggleFullscreen() {
diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs
index 1138d33c..8330504c 100644
--- a/client/DxPlay/Integration/Traffic.cs
+++ b/client/DxPlay/Integration/Traffic.cs
@@ -54,7 +54,7 @@ namespace DxPlay.Integration {
         }
 
         public void Update(TargetUpdateTrafficMessage message) {
-            logger.Info("Now update!!!!!!!!!");
+            //logger.Info("Now update!!!!!!!!!");
             selector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments);
         }
     }
diff --git a/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java b/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java
index 411214ae..401ff9d0 100644
--- a/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java
+++ b/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java
@@ -73,7 +73,6 @@ public class NexioDataMinerTest {
 			i--;
 		}
 		c.disconnect();
-		//c.getMediabase().getProtocol().setDescription("%0000205", "VALAMI");
 	}
 
 	@Test