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

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 ada4f36ec87fb4fc01fe7cefc2df60465b931ed8..491bf692c016ec66358ba656523c6d35db08ec4b 100644 (file)
--- a/client/DxPlay/DxPlay.csproj
+++ b/client/DxPlay/DxPlay.csproj
@@ -243,7 +243,7 @@
     <None Include="Configuration\dxplay.en">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
-    <None Include="Configuration\dxplay.json1">\r
+    <None Include="Configuration\dxplay.json">\r
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
     </None>\r
     <None Include="packages.config">\r

diff --git a/client/DxPlay/DxPlayer.cs b/client/DxPlay/DxPlayer.cs
index 2fb0a3b03a4490135c38401cf6c0e0838233713c..1ce72ed2005a792322e9ed5b413f0d1147a82684 100644 (file)
--- a/client/DxPlay/DxPlayer.cs
+++ b/client/DxPlay/DxPlayer.cs
@@ -288,8 +288,10 @@ namespace DxPlay {
                 playerHeight = (int)Math.Ceiling(rc.Right * x); ;\r
             }\r
 \r
-            hr = graph.VideoWindow.SetWindowPosition((rc.Right - playerWidth) / 2, (rc.Bottom - playerHeight) / 2, playerWidth, playerHeight);\r
-            DsError.ThrowExceptionForHR(hr);\r
+            if (graph != null) {\r
+                hr = graph.VideoWindow.SetWindowPosition((rc.Right - playerWidth) / 2, (rc.Bottom - playerHeight) / 2, playerWidth, playerHeight);\r
+                DsError.ThrowExceptionForHR(hr);\r
+            }\r
         }\r
 \r
         public void ToggleFullscreen() {\r

diff --git a/client/DxPlay/Integration/Traffic.cs b/client/DxPlay/Integration/Traffic.cs
index 1138d33c2ce41441cd434269b887eddf1593d04a..8330504c6319088bf6d131194af86a0956aedcd3 100644 (file)
--- a/client/DxPlay/Integration/Traffic.cs
+++ b/client/DxPlay/Integration/Traffic.cs
@@ -54,7 +54,7 @@ namespace DxPlay.Integration {
         }\r
 \r
         public void Update(TargetUpdateTrafficMessage message) {\r
-            logger.Info("Now update!!!!!!!!!");\r
+            //logger.Info("Now update!!!!!!!!!");\r
             selector.trafficAPI.UpdateTrafficInformation(message.VariantID, message.Ready, message.MetadataType, message.Segments);\r
         }\r
     }\r

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 411214ae59016d51bffe0f6331780185d3bf0fd8..401ff9d04a7a1ab6597b371b6183e2f243eee6e5 100644 (file)
--- 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--;\r
                }\r
                c.disconnect();\r
-               //c.getMediabase().getProtocol().setDescription("%0000205", "VALAMI");\r
        }\r
 \r
        @Test\r