Merge branch 'master' into feature/random-color

CHANGELOG.md

@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### In Progress
 - [Freezeable layers (encoder/decoder/etc.)](https://github.com/faceshiftlabs/DeepFaceLab/tree/feature/freezable-weights)
 
+## [1.1.5] - 2020-03-16
+### Fixed
+- Fixed unclosed websocket in Web UI client when exiting
+
+## [1.1.4] - 2020-03-16
+### Fixed
+- Fixed bug when exiting from Web UI
+
 ## [1.1.3] - 2020-03-16
 ### Changed
 - Updated changelog with unreleased features, links to working branches
@@ -34,7 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reset stale master branch to [seranus/DeepFaceLab](https://github.com/seranus/DeepFaceLab), 
   21 commits ahead of [iperov/DeepFaceLab](https://github.com/iperov/DeepFaceLab) ([compare](https://github.com/iperov/DeepFaceLab/compare/4818183...seranus:3f5ae05))
 
-[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.5...HEAD
+[1.1.5]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.4...v1.1.5
+[1.1.4]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.3...v1.1.4
+[1.1.3]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.0.0...v1.1.0

flaskr/templates/index.html

@@ -13,12 +13,24 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script type="text/javascript">
       $(function() {
+        const socket = io.connect();
+        socket.on('preview', function(msg) {
+          console.log(msg);
+          $('img#preview').attr("src", "{{ url_for('preview_image') }}?q=" + new Date().getTime());
+        });
+
+        socket.on('loss', function(loss_string) {
+          console.log(loss_string);
+          $('div#loss').html(loss_string);
+        });
+
         function save() {
           $.post("{{ url_for('save') }}");
         }
 
         function exit() {
           $.post("{{ url_for('exit') }}");
+          socket.close();
         }
 
         function update() {
@@ -63,17 +75,6 @@
         $('button#zoom_next').click(zoom_next);
 
         $('img#preview').click(update);
-
-        const socket = io.connect();
-        socket.on('preview', function(msg) {
-          console.log(msg);
-          $('img#preview').attr("src", "{{ url_for('preview_image') }}?q=" + new Date().getTime());
-        });
-
-        socket.on('loss', function(loss_string) {
-          console.log(loss_string);
-          $('div#loss').html(loss_string);
-        });
       });
     </script>
 </head>

mainscripts/Trainer.py

@@ -446,7 +446,7 @@ def main(**kwargs):
         while True:
             if not c2s.empty():
                 item = c2s.get()
-                op = input['op']
+                op = item['op']
                 if op == 'show':
                     is_waiting_preview = False
                     loss_history = item['loss_history'] if 'loss_history' in item.keys() else None