]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Fix for bos #18341: HOME environment variable jfa/18341_HOME
authorjfa <jfa@opencascade.com>
Wed, 15 Apr 2020 10:22:43 +0000 (13:22 +0300)
committerjfa <jfa@opencascade.com>
Wed, 15 Apr 2020 10:22:43 +0000 (13:22 +0300)
src/genericgui/BL_CreateJobWizard.cxx

index 1499eff7c7e1053a63d625a90cf9994c23c4f928..e3aa8f4fd7d1d5f06e985be8b35744e2954e88c9 100644 (file)
@@ -23,6 +23,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QTreeView>
+#include <QDir>
 
 #ifndef WNT
 #include <unistd.h>
@@ -1051,19 +1052,7 @@ FilesPage::FilesPage(CreateJobWizard * parent, SALOMEServices * salome_services)
   registerField("result_directory", ui->line_result_dir);
 
   // Default result directory is home directory (if we found it)
-  // First try -> HOME
-#ifdef WNT
-  ui->line_result_dir->setText(getenv("HOME"));
-#else
-  if (getenv("HOME"))
-    ui->line_result_dir->setText(getenv("HOME"));
-  else {
-    // Second try -> getpwuid
-    struct passwd * pass_struct = getpwuid(getuid());
-    if (pass_struct)
-      ui->line_result_dir->setText(pass_struct->pw_dir);
-  }
-#endif
+  ui->line_result_dir->setText(QDir::homePath());
 
   parent->setFilesList(ui->input_files_list, ui->output_files_list);