Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-23 05:47:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #936 from hypnosis-i2p/openssl

Browse source 
ReloadConfig + --log fix
This commit is contained in:
orignal 2017-08-27 13:43:09 -04:00 committed by GitHub
parent 9bfbba6fea 1c3174a277
commit 543566840c
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/jni/Application.mk
View file

@ -1,6 +1,7 @@
#APP_ABI := all #APP_ABI := all
#APP_ABI := armeabi-v7a x86 #APP_ABI := armeabi-v7a x86
#APP_ABI := x86 #APP_ABI := x86
#APP_ABI := x86_64
APP_ABI := armeabi-v7a APP_ABI := armeabi-v7a
#can be android-3 but will fail for x86 since arch-x86 is not present at ndkroot/platforms/android-3/ . libz is taken from there. #can be android-3 but will fail for x86 since arch-x86 is not present at ndkroot/platforms/android-3/ . libz is taken from there.
APP_PLATFORM := android-14 APP_PLATFORM := android-14

2
qt/i2pd_qt/mainwindow.cpp
View file

@ -766,6 +766,8 @@ void MainWindow::SaveTunnelsConfig() {
outfile << out.str().c_str(); outfile << out.str().c_str();
outfile.close(); outfile.close();
i2p::client::context.ReloadConfig();
} }
void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::updated(std::string oldName, TunnelConfig* tunConf) { void MainWindow::TunnelsPageUpdateListenerMainWindowImpl::updated(std::string oldName, TunnelConfig* tunConf) {

4
qt/i2pd_qt/mainwindow.h
View file

@ -218,7 +218,9 @@ public:
comboBox->setCurrentText(QString(ld)); comboBox->setCurrentText(QString(ld));
} }
virtual void saveToStringStream(std::stringstream& out){ virtual void saveToStringStream(std::stringstream& out){
optionValue=comboBox->currentText().toStdString(); std::string logDest = comboBox->currentText().toStdString();
if(logDest==std::string("stdout"))logDest="";
optionValue=logDest;
MainWindowItem::saveToStringStream(out); MainWindowItem::saveToStringStream(out);
} }
virtual bool isValid() { return true; } virtual bool isValid() { return true; }