From c3e70d6c59c6cd161b61e6c2e88aadf83b2af7bd Mon Sep 17 00:00:00 2001 From: tux3 Date: Mon, 25 May 2015 20:23:06 +0200 Subject: [PATCH] Revert "Updated for latest toxcore api" This reverts commit 7c8334bca90bf77ac745c484d1485b9e30e5de70. --- src/core/core.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/core.cpp b/src/core/core.cpp index 20e59b7ce..6ac86e8e9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -153,10 +153,6 @@ void Core::make_tox(QByteArray savedata) toxOptions.proxy_host = nullptr; toxOptions.proxy_port = 0; - toxOptions.savedata_type = (!savedata.isNull() ? TOX_SAVEDATA_TYPE_TOX_SAVE : TOX_SAVEDATA_TYPE_NONE); - toxOptions.savedata_data = (uint8_t*)savedata.data(); - toxOptions.savedata_length = savedata.size(); - if (proxyType != ProxyType::ptNone) { QString proxyAddr = Settings::getInstance().getProxyAddr(); @@ -184,13 +180,13 @@ void Core::make_tox(QByteArray savedata) } } - tox = tox_new(&toxOptions, nullptr); + tox = tox_new(&toxOptions, (uint8_t*)savedata.data(), savedata.size(), nullptr); if (tox == nullptr) { if (enableIPv6) // Fallback to IPv4 { toxOptions.ipv6_enabled = false; - tox = tox_new(&toxOptions, nullptr); + tox = tox_new(&toxOptions, (uint8_t*)savedata.data(), savedata.size(), nullptr); if (tox == nullptr) { if (toxOptions.proxy_type != TOX_PROXY_TYPE_NONE)