418.74418.74418

9 files changed, 19 insertions, 14 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 6942222..1208a0e 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.56
+NVIDIA_VERSION = 418.74
diff --git a/samples/version.mk b/samples/version.mk
index 6942222..1208a0e 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.56
+NVIDIA_VERSION = 418.74
diff --git a/src/gtk+-2.x/ctkappprofile.c b/src/gtk+-2.x/ctkappprofile.c
index b070f02..b6253d7 100644
--- a/src/gtk+-2.x/ctkappprofile.c
+++ b/src/gtk+-2.x/ctkappprofile.c
@@ -2030,7 +2030,7 @@ static EditRuleDialog* edit_rule_dialog_new(CtkAppProfile *ctk_app_profile)
     dialog->parent = GTK_WIDGET(ctk_app_profile);
     dialog->top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-    gtk_window_set_modal(GTK_WINDOW(dialog->top_window), TRUE);
+    gtk_window_set_modal(GTK_WINDOW(dialog->top_window), FALSE);
 
     g_signal_connect(G_OBJECT(dialog->top_window), "delete-event",
                      G_CALLBACK(edit_rule_dialog_handle_delete), dialog);
@@ -2996,7 +2996,7 @@ static EditProfileDialog *edit_profile_dialog_new(CtkAppProfile *ctk_app_profile
     dialog->setting_toolbar_help_data = NULL;
     dialog->bottom_help_data = NULL;
 
-    gtk_window_set_modal(GTK_WINDOW(dialog->top_window), TRUE);
+    gtk_window_set_modal(GTK_WINDOW(dialog->top_window), FALSE);
 
     g_signal_connect(G_OBJECT(dialog->top_window), "delete-event",
                      G_CALLBACK(edit_profile_dialog_handle_delete), dialog);
diff --git a/src/gtk+-2.x/ctkgridlicense.c b/src/gtk+-2.x/ctkgridlicense.c
index 4280b08..2d36867 100644
--- a/src/gtk+-2.x/ctkgridlicense.c
+++ b/src/gtk+-2.x/ctkgridlicense.c
@@ -119,7 +119,7 @@ static gboolean allow_digits(GtkWidget *widget, GdkEvent *event, gpointer user_d
 static gboolean enable_disable_ui_controls(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 static void update_gui_from_griddconfig(gpointer user_data);
 static gboolean licenseStateQueryFailed = FALSE;
-static void get_licensed_feature_information(gpointer user_data);
+static void get_licensable_feature_information(gpointer user_data);
 static gboolean is_restart_required(gpointer user_data);
 static gboolean queryLicensedFeatureCode = TRUE;
 int64_t licensedFeatureCode = NV_GRID_LICENSE_FEATURE_TYPE_VAPP;
@@ -843,7 +843,7 @@ static gboolean update_manage_grid_license_state_info(gpointer user_data)
                     break;
             }
             if (queryLicensedFeatureCode == TRUE) {
-                get_licensed_feature_information(ctk_manage_grid_license);
+                get_licensable_feature_information(ctk_manage_grid_license);
                 queryLicensedFeatureCode = FALSE;
             }
         }
@@ -1080,9 +1080,9 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data)
 }
 
 /*
- * get_licensed_feature_information() - Get the details of the feature that is licensed on this system.
+ * get_licensable_feature_information() - Get the details of the supported licensable features on the system.
  */
-static void get_licensed_feature_information(gpointer user_data)
+static void get_licensable_feature_information(gpointer user_data)
 {
     CtkManageGridLicense *ctk_manage_grid_license = CTK_MANAGE_GRID_LICENSE(user_data);
     nvmlGridLicensableFeatures_t *gridLicensableFeatures;
@@ -1107,6 +1107,11 @@ static void get_licensed_feature_information(gpointer user_data)
             licensedFeatureCode = gridLicensableFeatures->gridLicensableFeatures[i].featureCode;
             break;
         }
+        else if (gridLicensableFeatures->gridLicensableFeatures[i].featureState == 0 &&
+                 gridLicensableFeatures->gridLicensableFeatures[i].featureCode == NVML_GRID_LICENSE_FEATURE_CODE_VWORKSTATION)
+        {
+            break;
+        }
     }
     nvfree(gridLicensableFeatures);
 }
@@ -1558,7 +1563,7 @@ GtkWidget* ctk_manage_grid_license_new(CtrlTarget *target,
 
     gtk_box_set_spacing(GTK_BOX(ctk_manage_grid_license), 5);
 
-    get_licensed_feature_information(ctk_manage_grid_license);
+    get_licensable_feature_information(ctk_manage_grid_license);
 
     /* banner */
 
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 6942222..1208a0e 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.56
+NVIDIA_VERSION = 418.74
diff --git a/src/nvml.h b/src/nvml.h
index f0230bd..4bab7ae 100644
--- a/src/nvml.h
+++ b/src/nvml.h
@@ -243,7 +243,7 @@ typedef enum nvmlNvLinkUtilizationCountUnits_enum
     NVML_NVLINK_COUNTER_UNIT_CYCLES =  0,     // count by cycles
     NVML_NVLINK_COUNTER_UNIT_PACKETS = 1,     // count by packets
     NVML_NVLINK_COUNTER_UNIT_BYTES   = 2,     // count by bytes
-
+    NVML_NVLINK_COUNTER_UNIT_RESERVED = 3,    // count reserved for internal use
     // this must be last
     NVML_NVLINK_COUNTER_UNIT_COUNT
 } nvmlNvLinkUtilizationCountUnits_t;
diff --git a/src/version.h b/src/version.h
index dcde6d6..fed7ca5 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "418.56"
+#define NVIDIA_VERSION "418.74"
diff --git a/src/version.mk b/src/version.mk
index 6942222..1208a0e 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.56
+NVIDIA_VERSION = 418.74
diff --git a/version.mk b/version.mk
index 6942222..1208a0e 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 418.56
+NVIDIA_VERSION = 418.74