Final Bug Fix before release

goxr3plus · Jun 9, 2018 · f474333 · f474333
1 parent 7dcaf9e
commit f474333
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/resources/fxml/PlayListModesTabPane.fxml b/resources/fxml/PlayListModesTabPane.fxml
@@ -32,7 +32,7 @@
                         <FontIcon iconColor="#ff3c26" iconLiteral="fas-heart" iconSize="20" />
                      </graphic>
                   </Tab>
-                  <Tab fx:id="downloadsTab" closable="false" disable="true" text="Downloads ( Coming... )">
+                  <Tab fx:id="downloadsTab" closable="false" disable="true" text="Coming...">
                      <content>
                         <StackPane prefHeight="150.0" prefWidth="200.0">
                            <children>

diff --git a/resources/fxml/smartcontroller/SmartController.fxml b/resources/fxml/smartcontroller/SmartController.fxml
@@ -231,12 +231,12 @@
                   <FontIcon iconColor="WHITE" iconLiteral="gmi-album" iconSize="24" />
                </graphic>
           </Tab>
-            <Tab fx:id="foldersModeTab" text="Folders">
+            <Tab fx:id="foldersModeTab" disable="true" text="Coming...">
                <graphic>
                   <FontIcon iconColor="#ddaa33" iconLiteral="gmi-folder" iconSize="24" />
                </graphic>
             </Tab>
-            <Tab fx:id="filtersModeTab" text="Filter : Artists">
+            <Tab fx:id="filtersModeTab" disable="true" text="Coming...">
                <graphic>
                   <FontIcon iconColor="#f5ca30" iconLiteral="typ-filter" iconSize="24" />
                </graphic>
@@ -287,4 +287,4 @@
          </children>
       </VBox>
    </children>
-</fx:root>
+</fx:root>
diff --git a/src/main/java/com/goxr3plus/xr3player/application/Main.java b/src/main/java/com/goxr3plus/xr3player/application/Main.java
@@ -798,7 +798,7 @@ public static void startAppWithUser(User selectedUser) {
 			//sideBar.getNameLabel().textProperty().bind(userInfoMode.getUserName().textProperty())
 
 			//Start these important Threads
-			//new MediaUpdaterService().start();
+			new MediaUpdaterService().start();
 			//new XPlayersFilterService().start()
 			webBrowser.startChromiumUpdaterService();
 

diff --git a/src/main/java/com/goxr3plus/xr3player/smartcontroller/services/MediaUpdaterService.java b/src/main/java/com/goxr3plus/xr3player/smartcontroller/services/MediaUpdaterService.java
@@ -123,8 +123,6 @@ else if (controller.getFiltersModeTab().isSelected())
 
 			//XPlayers
 			Main.xPlayersList.getList().stream()
-					//Only if the Settings Mode is selected
-					.filter(xPlayerController -> xPlayerController.getSettingsToggle().isSelected())
 					//Extra filtering
 					.filter(xPlayerController -> {
 						//If extended pass
@@ -148,16 +146,19 @@ else if (xPlayerController.getKey() != 0 && Main.topBar.isTabSelected(Main.topBa
 						//Fix the emotion image
 						xPlayerController.changeEmotionImage(Main.emotionListsController.getEmotionForMedia(xPlayerController.getxPlayerModel().songPathProperty().get()));
 
-						//Find the smartController
-						SmartController controller = xPlayerController.getxPlayerPlayList().getSmartController();
-
-						//Normal Mode  
-						if (controller.getNormalModeTab().isSelected())
-							filterController(controller, controller.getItemsObservableList());
-
-						//Filters Mode
-						else if (controller.getFiltersModeTab().isSelected())
-							filterController(controller, controller.getFiltersMode().getMediaTableViewer().getTableView().getItems());
+						//Only if the Settings Mode is selected
+						if (xPlayerController.getSettingsToggle().isSelected()) {
+							//Find the smartController
+							SmartController controller = xPlayerController.getxPlayerPlayList().getSmartController();
+
+							//Normal Mode  
+							if (controller.getNormalModeTab().isSelected())
+								filterController(controller, controller.getItemsObservableList());
+
+							//Filters Mode
+							else if (controller.getFiltersModeTab().isSelected())
+								filterController(controller, controller.getFiltersMode().getMediaTableViewer().getTableView().getItems());
+						}
 					});
 
 			//--