← Back to branch summary

~mateo-salta/nitroshare/nitroshare

« back to all changes in this revision

Viewing changes to src/discovery/CBroadcastServer.cpp

  • Committer: Nathan Osman
  • Date: 2012-06-27 21:56:40 UTC
  • Revision ID: admin@quickmediasolutions.com-20120627215640-c6mspvllk1br9vx2
Implemented basic progress bar for uploads (which seems to be broken at the moment) and corrected a bug with the way unique IDs were generated for each machine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/discovery/CBroadcastServer.cpp
80
80
       info.contains("transmission_port") && info.contains("start_time"))
81
81
    {
82
82
        /* Make sure we don't accidentally detect ourselves. */
83
 
        if(info["id"] != Settings::Get("Internal/ID"))
 
83
        if(info["id"] != Settings::GetID())
84
84
            UpdateMachineEntry(src, info["id"].toString(), info["name"].toByteArray(),
85
85
                               info["transmission_port"].toUInt(), info["start_time"].toLongLong());
86
86
    }
92
92
{
93
93
    /* Construct the JSON map containing some information about our instance. */
94
94
    QVariantMap info;
95
 
    info["id"]                = Settings::Get("Internal/ID");
 
95
    info["id"]                = Settings::GetID();
96
96
    info["name"]              = Settings::Get("General/MachineName");
97
97
    info["transmission_port"] = Settings::Get("Network/TransmissionPort");
98
98
    info["start_time"]        = m_start_time;