Fix awk not found while importing pcap on Windows
For non-Windows platforms, the default paths for awk, diff, gzip are fixed at compile time since these are standard utilities for these platforms. However, for Windows, we ship these utilities along with Ostinato, so we need to set default path as the application directory which is known only at run time. This is done as part of Preferences::initDefaults() and therefore should be called before setting OstProtoLib external program paths
This commit is contained in:
parent
a1582ad67b
commit
0897ae6dad
@ -65,6 +65,8 @@ int main(int argc, char* argv[])
|
||||
OstProtocolManager = new ProtocolManager();
|
||||
OstProtocolWidgetFactory = new ProtocolWidgetFactory();
|
||||
|
||||
Preferences::initDefaults();
|
||||
|
||||
/* (Portable Mode) If we have a .ini file in the same directory as the
|
||||
executable, we use that instead of the platform specific location
|
||||
and format for the settings */
|
||||
@ -81,7 +83,6 @@ int main(int argc, char* argv[])
|
||||
appSettings->value(kDiffPathKey, kDiffPathDefaultValue).toString(),
|
||||
appSettings->value(kAwkPathKey, kAwkPathDefaultValue).toString());
|
||||
|
||||
Preferences::initDefaults();
|
||||
qsrand(QDateTime::currentDateTime().toTime_t());
|
||||
|
||||
mainWindow = new MainWindow;
|
||||
|
Loading…
Reference in New Issue
Block a user