oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix master merge assuming wrpc, vm and new versioning style

This commit is contained in:
Doyle 2020-05-15 14:03:14 +10:00
parent 9ea07ce33b
commit 30f4255689
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -44,7 +44,7 @@ cmake_minimum_required(VERSION 3.7)
message(STATUS "CMake version ${CMAKE_VERSION}")
project(loki
VERSION 7.1.8
VERSION 7.1.9
LANGUAGES CXX C)
set(LOKI_RELEASE_CODENAME "Valiant Vidar")

2
src/wallet/wallet_rpc_server.cpp
View File

@ -4567,7 +4567,7 @@ namespace tools
}
just_dir:
wrpc->m_long_poll_disabled = tools::wallet2::has_disable_rpc_long_poll(vm);
m_long_poll_disabled = tools::wallet2::has_disable_rpc_long_poll(m_vm);
if (wal) set_wallet(std::move(wal));
bool r = init();
CHECK_AND_ASSERT_MES(r, false, tools::wallet_rpc_server::tr("Failed to initialize wallet RPC server"));