Fixing LUT

Rambalac · Apr 6, 2017 · b6709dc · b6709dc
1 parent 79626c5
commit b6709dc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/GMaster/Views/CameraViewControl.xaml.cs b/GMaster/Views/CameraViewControl.xaml.cs
@@ -70,7 +70,7 @@ public void Dispose()
         private async void Camera_LiveViewUpdated(Stream stream)
         {
             stream.Position = 0;
-            liveViewBitmap = await CanvasBitmap.LoadAsync(LiveView, stream.AsRandomAccessStream());
+            bitmap = await CanvasBitmap.LoadAsync(LiveView, stream.AsRandomAccessStream());
             LiveView.Invalidate();
         }
 
@@ -163,7 +163,6 @@ private void LiveView_OnDraw(CanvasControl sender, CanvasDrawEventArgs args)
             ICanvasImage content = bitmap;
             if (lutEffect != null)
             {
-                content = lutEffect.GenerateEffect(content);
             }
 
             args.DrawingSession.DrawImage(content, imageRect, new Rect(0, 0, iW, iH), 1.0f, CanvasImageInterpolation.NearestNeighbor);
@@ -217,6 +216,10 @@ private async Task CameraSet()
         {
             var lutName = Model.SelectedCamera.Settings.LutName;
             var lut = await Model.SelectedCamera.Model.LoadLut(lutName);
+            if (lut == null)
+            {
+                return;
+            }
 
             if (lut.BlueNum > 0)
             {